Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 hebcal (4.20-2) unstable; urgency=medium
 .
   * Track upstream changes (closes: #957331)
Author: Barak A. Pearlmutter <bap@debian.org>
Bug-Debian: https://bugs.debian.org/957331

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2020-05-17

--- hebcal-4.20.orig/Makefile.in
+++ hebcal-4.20/Makefile.in
@@ -350,6 +350,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- hebcal-4.20.orig/README.md
+++ hebcal-4.20/README.md
@@ -21,15 +21,7 @@ be individualy turned on or off:
 ## Synopsis
 
 ```
-usage: hebcal [-8acdDeEFHhiorsStTwWyZ]
-            [-b candle_lighting_minutes_before_sundown ]
-            [-I file]
-            [-Y yahrtzeit_file]
-            [-C city]
-            [-L longitude -l latitude]
-            [-m havdalah_minutes_past_sundown ]
-            [-z timezone]
-            [[ month [ day ]] year ]
+usage: hebcal [options] [[ month [ day ]] year ]
        hebcal help
        hebcal info
        hebcal cities
@@ -48,44 +40,58 @@ Note: Use COMPLETE Years.  You probably
 hebcal 93, but rather hebcal 1993.
 
 ### Options
+#### General options
 Option | Description
 --- | ---
--8 | Use 8-bit Hebrew (ISO-8859-8-Logical).
--a | Use Ashkenazi Hebrew.
--b mins | Set candle-lighting to occur this many minutes before sundown
--c | Print candlelighting times.
--C city | Set latitude, longitude, and timezone according to specified city. This option implies the -c option.
-   -d | print the Hebrew date for the entire date range.
-   -D | print the Hebrew date for dates with some events
-   -e | Output "European" dates -- DD.MM.YYYY format.
-   -E | Output 24-hour times (e.g. 18:37 instead of 6:37).
-   -F | Output the Daf Yomi for the entire date range.
-   -h | Suppress default holidays.
-   -H | Use Hebrew date ranges - only needed when e.g. `hebcal -H 5373`
-   -i | Use Israeli sedra scheme.
-   -I file | Get non-yahrtzeit Hebrew user events from specified file. The format is: `mmm dd string`, Where `mmm` is a Hebrew month name.
-   -l xx,yy | Set the latitude for solar calculations to `xx` degrees and `yy` minutes.  Negative values are south.
-   -L xx,yy | Set the longitude for solar calculations to `xx` degrees and `yy` minutes.  *Negative values are EAST*. The `-l` and `-L` switches must both be used, or not at all. These switches override the `-C` (localize to city) switch.
+  --help | Show help text
+  --version | Show version number
+
+#### Input Options
+Option | Description
+--- | ---
+ -H, --hebrew-date | Use Hebrew date ranges - only needed when e.g. `hebcal -H 5373`
+ -I, --infile INFILE | Get non-yahrtzeit Hebrew user events from specified file. The format is: `mmm dd string`, Where `mmm` is a Hebrew month name.
+ -t, --today | Only output for today's date
+ -T, --today-brief | Print today's pertinent information, no Gregorian date.
+ -Y, --yahrtzeit YAHRTZEIT | Get yahrtzeit dates from specified file. The format is: `mm dd yyyy string`. The first three fields specify a *Gregorian* date.
+
+#### Output Options
+Option | Description
+--- | ---
+   -8 | Use 8-bit Hebrew (ISO-8859-8-Logical).
+   -a, --ashkenazi | Use Ashkenazi Hebrew.
+   -d, --add-hebrew-dates | print the Hebrew date for the entire date range.
+   -D, --add-hebrew-dates-for-events | print the Hebrew date for dates with some events
+   -e, --euro-dates | Output "European" dates -- DD.MM.YYYY format.
+   -E, --24hour | Output 24-hour times (e.g. 18:37 instead of 6:37).
+   -F, --daf-yomi | Output the Daf Yomi for the entire date range.
+   -g, --iso-8601 | Output ISO 8601 dates -- YYYY-MM-DD (this overrides -y)
+   -h, --no-holidays | Suppress default holidays.
+   -i, --israeli | Use Israeli sedra scheme.
    --lang LANG | Use ISO 639-1 LANG code (one of `ashkenazi`, `ashkenazi_litvish`, `ashkenazi_poylish`, `ashkenazi_standard`, `fi`, `fr`, `he`, `hu`, `pl`, `ru`)
-   -m mins | Set havdalah to occur this many minutes after sundown
-   -M | Print the molad on shabbat mevorchim.
-   -o | Add days of the omer.
-   -O | Output sunrise and sunset times every day.
-   -r | Tab delineated format.
-   -s | Add weekly sedrot on Saturday.
-   -S | Print sedrah of the week on all calendar days.
-   -t | Only output for today's date.
-   -T | Print today's pertinent information, no Gregorian date.
-   -w | Add day of the week.
-   -W | Weekly view. Omer, dafyomi, and non-date-specific zemanim are shown once a week, on the day which corresponds to the first day in the range.
-   -x | Suppress Rosh Chodesh.
-   -y | Print only last two digits of year.
+   -M, --molad | Print the molad on shabbat mevorchim.
+   -o, --omer | Add days of the omer.
+   -O, --sunrise-and-sunset | Output sunrise and sunset times every day.
+   -r, --tabs | Tab delineated format.
+   -s, --sedrot | Add weekly sedrot on Saturday.
+   -S, --daily-sedra | Print sedrah of the week on all calendar days.
+   -w, --weekday | Add day of the week.
+   -W, --abbreviated | Weekly view. Omer, dafyomi, and non-date-specific zemanim are shown once a week, on the day which corresponds to the first day in the range.
+   -x, --no-rosh-chodesh | Suppress Rosh Chodesh.
+   -y, --year-abbrev | Print only last two digits of year.
    --years N | Generate events for `N` years (default `1`)
-   -Y file | Get yahrtzeit dates from specified file. The format is: `mm dd yyyy string`. The first three fields specify a *Gregorian* date.
-   -z timezone | Use specified timezone, overriding the `-C` (localize to city) switch.
-   -Z | **EXPERIMENTAL** Add zemanim (Alot HaShachar; Misheyakir; Kriat Shema, sof zeman; Tefilah, sof zeman; Chatzot hayom; Mincha Gedolah; Mincha Ketanah; Plag HaMincha; Tzait HaKochavim)
-   --help | Show help text
-   --version | Show version number
+
+#### Options related to candle-lighting times
+Option | Description
+--- | ---
+   -b, --candle-mins mins | Set candle-lighting to occur this many minutes before sundown
+   -c, --candlelighting | Print candlelighting times.
+   -C, --city city | Set latitude, longitude, and timezone according to specified city. This option implies the -c option.
+   -l, --latitude xx,yy | Set the latitude for solar calculations to `xx` degrees and `yy` minutes.  Negative values are south.
+   -L, --longitude xx,yy | Set the longitude for solar calculations to `xx` degrees and `yy` minutes.  *Negative values are EAST*. The `-l` and `-L` switches must both be used, or not at all. These switches override the `-C` (localize to city) switch.
+   -m, --havdalah-mins mins | Set havdalah to occur this many minutes after sundown
+   -z, --timezone timezone | Use specified timezone, overriding the `-C` (localize to city) switch.
+   -Z, --zmanim | **EXPERIMENTAL** Add zemanim (Alot HaShachar; Misheyakir; Kriat Shema, sof zeman; Tefilah, sof zeman; Chatzot hayom; Mincha Gedolah; Mincha Ketanah; Plag HaMincha; Tzait HaKochavim)
 
 ## Candle-lighting times
 
--- hebcal-4.20.orig/astro.c
+++ hebcal-4.20/astro.c
@@ -149,7 +149,7 @@ static void astro_sunpos(double d, doubl
 	E = M + e * RADEG * sind(M) * (1.0 + e * cosd(M));
 	x = cosd(E) - e;
 	y = sqrt(1.0 - e*e) * sind(E);
-	*r = sqrt(x*x + y*y);              /* Solar distance */
+	*r = hypot(x, y);                  /* Solar distance */
 	v = atan2d(y, x);                  /* True anomaly */
 	*lon = v + w;                        /* True solar longitude */
 	if (*lon >= 360.0) {
@@ -177,7 +177,7 @@ static void astro_sun_RA_dec(double d, d
 
 	/* Convert to spherical coordinates */
 	*RA = atan2d(y, x);
-	*dec = atan2d(z, sqrt(x*x + y*y));
+	*dec = atan2d(z, hypot(x, y));
 }
 
 /**
--- /dev/null
+++ hebcal-4.20/compile
@@ -0,0 +1,348 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
--- hebcal-4.20.orig/config.h.in
+++ hebcal-4.20/config.h.in
@@ -1,42 +1,14 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* "The default city" */
+/* The Default City */
 #undef CITY
 
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#undef ENABLE_NLS
-
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#undef HAVE_DCGETTEXT
-
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the <libintl.h> header file. */
-#undef HAVE_LIBINTL_H
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
 #undef HAVE_MALLOC
@@ -44,9 +16,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the `sqrt' function. */
-#undef HAVE_SQRT
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
--- hebcal-4.20.orig/configure
+++ hebcal-4.20/configure
@@ -585,7 +585,7 @@ PACKAGE_STRING='hebcal 4.20'
 PACKAGE_BUGREPORT='hebcal-bugs@sadinoff.com'
 PACKAGE_URL=''
 
-ac_unique_file="common.c"
+ac_unique_file="hebcal.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -685,6 +685,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -758,6 +759,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1010,6 +1012,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1147,7 +1158,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1300,6 +1311,7 @@ Fine tuning of the installation director
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1343,8 +1355,9 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-default-city=CITYNAME    make the default city CITYNAME.
-                                  If unspecified, the default city will be "New York"
+  --with-default-city=CITYNAME
+                          make the default city CITYNAME. If unspecified, the
+                          default city will be "New York"
 
 Some influential environment variables:
   CC          C compiler command
@@ -3677,6 +3690,89 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+# Enable all the warnings.
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for maximum warnings" >&5
+$as_echo_n "checking CFLAGS for maximum warnings... " >&6; }
+if ${ac_cv_cflags_warn_all+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_cflags_warn_all="no, unknown"
+ac_save_CFLAGS="$CFLAGS"
+for ac_arg in "-warn all  % -warn all"      "-pedantic  % -Wall"          "-xstrconst % -v"             "-std1      % -verbose -w0 -warnprotos"    "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd"    "-ansi -ansiE % -fullwarn"    "+ESlit     % +w1"            "-Xc        % -pvctl,fullmsg"    "-h conform % -h msglevel 2"    #
+do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+CFLAGS="$ac_save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_warn_all" >&5
+$as_echo "$ac_cv_cflags_warn_all" >&6; }
+
+
+case ".$ac_cv_cflags_warn_all" in
+     .ok|.ok,*)  ;;
+   .|.no|.no,*)  ;;
+   *)
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $ac_cv_cflags_warn_all "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$ac_cv_cflags_warn_all"; } >&5
+  (: CFLAGS already contains $ac_cv_cflags_warn_all) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $ac_cv_cflags_warn_all"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  CFLAGS=$ac_cv_cflags_warn_all
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+ ;;
+esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
 
 ac_ext=c
@@ -4090,13 +4186,236 @@ done
 
 
 # Checks for libraries.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
-$as_echo_n "checking for sqrt in -lm... " >&6; }
-if ${ac_cv_lib_m_sqrt+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing hypot" >&5
+$as_echo_n "checking for library containing hypot... " >&6; }
+if ${ac_cv_search_hypot+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char hypot ();
+int
+main ()
+{
+return hypot ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_hypot=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_hypot+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_hypot+:} false; then :
+
+else
+  ac_cv_search_hypot=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_hypot" >&5
+$as_echo "$ac_cv_search_hypot" >&6; }
+ac_res=$ac_cv_search_hypot
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sin" >&5
+$as_echo_n "checking for library containing sin... " >&6; }
+if ${ac_cv_search_sin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sin ();
+int
+main ()
+{
+return sin ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_sin=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_sin+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_sin+:} false; then :
+
+else
+  ac_cv_search_sin=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sin" >&5
+$as_echo "$ac_cv_search_sin" >&6; }
+ac_res=$ac_cv_search_sin
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cos" >&5
+$as_echo_n "checking for library containing cos... " >&6; }
+if ${ac_cv_search_cos+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_cos=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_cos+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_cos+:} false; then :
+
+else
+  ac_cv_search_cos=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cos" >&5
+$as_echo "$ac_cv_search_cos" >&6; }
+ac_res=$ac_cv_search_cos
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing atan" >&5
+$as_echo_n "checking for library containing atan... " >&6; }
+if ${ac_cv_search_atan+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char atan ();
+int
+main ()
+{
+return atan ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_atan=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_atan+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_atan+:} false; then :
+
+else
+  ac_cv_search_atan=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_atan" >&5
+$as_echo "$ac_cv_search_atan" >&6; }
+ac_res=$ac_cv_search_atan
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5
+$as_echo_n "checking for library containing sqrt... " >&6; }
+if ${ac_cv_search_sqrt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -4115,23 +4434,147 @@ return sqrt ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_sqrt=yes
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_sqrt=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_sqrt+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_sqrt+:} false; then :
+
 else
-  ac_cv_lib_m_sqrt=no
+  ac_cv_search_sqrt=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5
+$as_echo "$ac_cv_search_sqrt" >&6; }
+ac_res=$ac_cv_search_sqrt
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acos" >&5
+$as_echo_n "checking for library containing acos... " >&6; }
+if ${ac_cv_search_acos+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acos ();
+int
+main ()
+{
+return acos ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_acos=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if ${ac_cv_search_acos+:} false; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
-$as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
+done
+if ${ac_cv_search_acos+:} false; then :
+
+else
+  ac_cv_search_acos=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acos" >&5
+$as_echo "$ac_cv_search_acos" >&6; }
+ac_res=$ac_cv_search_acos
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fabs" >&5
+$as_echo_n "checking for library containing fabs... " >&6; }
+if ${ac_cv_search_fabs+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char fabs ();
+int
+main ()
+{
+return fabs ();
+  ;
+  return 0;
+}
 _ACEOF
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_fabs=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_fabs+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_fabs+:} false; then :
 
-  LIBS="-lm $LIBS"
+else
+  ac_cv_search_fabs=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fabs" >&5
+$as_echo "$ac_cv_search_fabs" >&6; }
+ac_res=$ac_cv_search_fabs
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
@@ -4425,7 +4868,7 @@ $as_echo "#define malloc rpl_malloc" >>c
 fi
 
 
-for ac_func in sqrt strchr strdup
+for ac_func in strchr strdup
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -4554,6 +4997,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
--- hebcal-4.20.orig/configure.ac
+++ hebcal-4.20/configure.ac
@@ -1,25 +1,28 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.57)
-AC_INIT(hebcal,4.20,hebcal-bugs@sadinoff.com)
+AC_PREREQ([2.69])
+AC_INIT([hebcal],[4.20],[hebcal-bugs@sadinoff.com])
 AM_MAINTAINER_MODE([disable])
-AM_INIT_AUTOMAKE([foreign no-dependencies no-installinfo])
-AC_CONFIG_SRCDIR([common.c])
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([foreign no-dependencies no-installinfo -Wall])
+AC_CONFIG_SRCDIR([hebcal.c])
+AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
 AC_PROG_CC
+# Enable all the warnings.
+AX_CFLAGS_WARN_ALL
 
 AC_CHECK_HEADERS([getopt.h])
 
 # Checks for libraries.
-dnl AC_CHECK_LIB(m, sin)
-dnl AC_CHECK_LIB(m, cos)
-dnl AC_CHECK_LIB(m, atan)
-AC_CHECK_LIB(m, sqrt)
-dnl AC_CHECK_LIB(m, acos)
-dnl AC_CHECK_LIB(m, fabs)
+AC_SEARCH_LIBS([hypot], [m])
+AC_SEARCH_LIBS([sin], [m])
+AC_SEARCH_LIBS([cos], [m])
+AC_SEARCH_LIBS([atan], [m])
+AC_SEARCH_LIBS([sqrt], [m])
+AC_SEARCH_LIBS([acos], [m])
+AC_SEARCH_LIBS([fabs], [m])
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -31,12 +34,12 @@ AC_TYPE_SIZE_T
 
 # Checks for library functions.
 AC_FUNC_MALLOC
-AC_CHECK_FUNCS([sqrt strchr strdup])
-AC_ARG_WITH(default-city,
-[[  --with-default-city=CITYNAME    make the default city CITYNAME.
-                                  If unspecified, the default city will be "New York"]],
-             AC_DEFINE_UNQUOTED(CITY,"$withval",["The Default City"]),
-             AC_DEFINE(CITY,"New_York",["The default city"]))
+AC_CHECK_FUNCS([strchr strdup])
+AC_ARG_WITH([default-city],
+  [AS_HELP_STRING([--with-default-city=CITYNAME],
+     [make the default city CITYNAME.  If unspecified, the default city will be "New York"])],
+     [AC_DEFINE_UNQUOTED(CITY,"$withval",[The Default City])],
+     [AC_DEFINE(CITY,"New_York",[The Default City])])
 
 AC_CONFIG_FILES([hebcal.1])
 AC_CONFIG_FILES([Makefile])
--- hebcal-4.20.orig/hebcal.c
+++ hebcal-4.20/hebcal.c
@@ -295,7 +295,6 @@ void print_candlelighting_times( int mas
 {
     double gmt_offset;
     double h_rise, h_set, N;
-    const int calc_sunset = 1;
     double n_offset;
     int hour, minute, pm;
     int rs;
@@ -318,7 +317,6 @@ void print_candlelighting_times( int mas
     {
        double var_hour;
        int min_offset;
-       char *name;
       
        if ( (zemanim[i_zman].flags & mask) == 0 )
           continue;
@@ -400,12 +398,11 @@ void main_calendar( long todayAbs, long
     year_t theYear;
     char *omerStr ;
     int omer, day_of_week, first_weekday, returnedMask;
-    int omer_today, sedra_today, candle_today, holidays_today, molad_today;
+    int omer_today, sedra_today, holidays_today, molad_today;
     molad_t moladNext;
     int monthNext;
     int today_zemanim, i_zman;
     int num_zmanim = sizeof (zemanim) / sizeof (struct _zman); 
-    char buffer[80];
     
 /* Used to decide whether a particular type of daily info should be
    included in the abbreviated view. In abbreviated mode things like
--- hebcal-4.20.orig/install-sh
+++ hebcal-4.20/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2018-03-11.20; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@ while test $# -ne 0; do
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -266,122 +271,113 @@ do
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
+    # If destination is a directory, append the input filename.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
-      dst=$dstdir/`basename "$src"`
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
   fi
 
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
+            # here however when possible just to lower collision chance.
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # Because "mkdir -p" follows existing symlinks and we likely work
+            # directly in world-writeable /tmp, make sure that the '$tmpdir'
+            # directory is successfully created first before we actually test
+            # 'mkdir -p' feature.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -391,53 +387,51 @@ do
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test X"$d" = X && continue
+        test X"$d" = X && continue
 
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -450,8 +444,8 @@ do
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -472,15 +466,12 @@ do
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -493,24 +484,24 @@ do
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
 
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
@@ -519,9 +510,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- /dev/null
+++ hebcal-4.20/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
--- hebcal-4.20.orig/po/ashkenazi_litvish.po
+++ hebcal-4.20/po/ashkenazi_litvish.po
@@ -179,6 +179,9 @@ msgstr "Niddo"
 msgid "Daf Yomi: %s %d"
 msgstr "Daf Yeimi: %s %d"
 
+msgid "Daf Yomi"
+msgstr "Daf Yeimi"
+
 #: ../holidays.c:380
 msgid "Unable to allocate memory for holiday."
 msgstr ""
--- hebcal-4.20.orig/po/ashkenazi_poylish.po
+++ hebcal-4.20/po/ashkenazi_poylish.po
@@ -180,6 +180,9 @@ msgstr "Niddu"
 msgid "Daf Yomi: %s %d"
 msgstr "Daf Yoymi: %s %d"
 
+msgid "Daf Yomi"
+msgstr "Daf Yoymi"
+
 #: ../holidays.c:380
 msgid "Unable to allocate memory for holiday."
 msgstr ""
@@ -512,6 +515,9 @@ msgstr "Purim Koton"
 msgid "Rosh Chodesh %s"
 msgstr "Rosh Choydesh %s"
 
+msgid "Rosh Chodesh"
+msgstr "Rosh Choydesh"
+
 msgid "Adar"
 msgstr "Odor"
 
--- hebcal-4.20.orig/po/ashkenazi_standard.po
+++ hebcal-4.20/po/ashkenazi_standard.po
@@ -179,6 +179,9 @@ msgstr "Niddo"
 msgid "Daf Yomi: %s %d"
 msgstr "Daf Yoymi: %s %d"
 
+msgid "Daf Yomi"
+msgstr "Daf Yoymi"
+
 #: ../holidays.c:380
 msgid "Unable to allocate memory for holiday."
 msgstr ""
@@ -511,6 +514,9 @@ msgstr "Purim Koton"
 msgid "Rosh Chodesh %s"
 msgstr "Rosh Choydesh %s"
 
+msgid "Rosh Chodesh"
+msgstr "Rosh Choydesh"
+
 msgid "Adar"
 msgstr "Odor"
 
--- hebcal-4.20.orig/po/fi.po
+++ hebcal-4.20/po/fi.po
@@ -179,6 +179,9 @@ msgstr "Nida"
 msgid "Daf Yomi: %s %d"
 msgstr "Daf jomi: %s %d"
 
+msgid "Daf Yomi"
+msgstr "Daf jomi"
+
 #: ../holidays.c:380
 msgid "Unable to allocate memory for holiday."
 msgstr ""
@@ -511,6 +514,9 @@ msgstr "Purim katan"
 msgid "Rosh Chodesh %s"
 msgstr "Rosh chodesh %s"
 
+msgid "Rosh Chodesh"
+msgstr "Rosh chodesh"
+
 msgid "Adar"
 msgstr "Adar"
 
--- hebcal-4.20.orig/po/fr.po
+++ hebcal-4.20/po/fr.po
@@ -513,6 +513,9 @@ msgstr "Pourim Katan"
 msgid "Rosh Chodesh %s"
 msgstr "Roch H̲odech %s"
 
+msgid "Rosh Chodesh"
+msgstr "Roch H̲odech"
+
 msgid "Adar"
 msgstr "Adar"
 
--- hebcal-4.20.orig/po/hu.po
+++ hebcal-4.20/po/hu.po
@@ -175,6 +175,9 @@ msgstr "Nidá"
 msgid "Daf Yomi: %s %d"
 msgstr "Daf Jomi: %s %d"
 
+msgid "Daf Yomi"
+msgstr "Daf Jomi"
+
 #: ../holidays.c:380
 msgid "Unable to allocate memory for holiday."
 msgstr ""
@@ -507,6 +510,9 @@ msgstr "Purim Kátán"
 msgid "Rosh Chodesh %s"
 msgstr "Ros chódes %s"
 
+msgid "Rosh Chodesh"
+msgstr "Ros chódes"
+
 msgid "Adar"
 msgstr "Ádár"
 
--- hebcal-4.20.orig/po/pl.po
+++ hebcal-4.20/po/pl.po
@@ -511,6 +511,9 @@ msgstr ""
 msgid "Rosh Chodesh %s"
 msgstr "Rosz Chodesz %s"
 
+msgid "Rosh Chodesh"
+msgstr "Rosz Chodesz"
+
 msgid "Adar"
 msgstr ""
 
--- hebcal-4.20.orig/po/ru.po
+++ hebcal-4.20/po/ru.po
@@ -227,6 +227,9 @@ msgstr "Нида"
 msgid "Daf Yomi: %s %d"
 msgstr "Страница Дня: %s %d"
 
+msgid "Daf Yomi"
+msgstr "Страница Дня"
+
 msgid "Parashat"
 msgstr "Глава"
 
@@ -507,6 +510,9 @@ msgstr "Маленький Пурим"
 msgid "Rosh Chodesh %s"
 msgstr "Новый Месяц %s"
 
+msgid "Rosh Chodesh"
+msgstr "Новый Месяц"
+
 msgid "Adar"
 msgstr "Адар"
 
--- hebcal-4.20.orig/po2gperf.pl
+++ hebcal-4.20/po2gperf.pl
@@ -63,7 +63,7 @@ print OUT <<EOF;
 
 #define HEBCAL_LANG_LIST "$locale_list"
 
-const char *hebcal_langs[$locale_list_len];
+extern const char *hebcal_langs[$locale_list_len];
 
 struct event_title { char *name; char *dest; };
 
--- hebcal-4.20.orig/sedra.c
+++ hebcal-4.20/sedra.c
@@ -197,7 +197,7 @@ void reset_sedra( int hebYr ) /* the heb
     date_t tempDt;
     int long_c, short_k, rosh_hashana_day, type;
     long int rosh_hashana;
-    size_t theSedraArraySize;
+    size_t theSedraArraySize = 0; /* avoid warning */;
     
     long_c = long_cheshvan (hebYr);
     short_k = short_kislev (hebYr);
--- hebcal-4.20.orig/start.c
+++ hebcal-4.20/start.c
@@ -650,7 +650,7 @@ void handleArgs(int argc, char *argv[])
                            ZMAN_PLAG_HAMINCHA | ZMAN_SUNSET | ZMAN_TZAIT_42);
    }
 
-   if (!TZ_INFO && (zemanim_sw || candleLighting_sw)) {
+   if (!TZ_INFO && (zemanim_sw || candleLighting_sw || printSunriseSunset_sw)) {
       set_default_city();
    }
 
--- hebcal-4.20.orig/strings_ashkenazi.c
+++ hebcal-4.20/strings_ashkenazi.c
@@ -1,5 +1,5 @@
-/* C code produced by gperf version 3.0.3 */
-/* Command-line: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/gperf strings_ashkenazi.gperf  */
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf strings_ashkenazi.gperf  */
 /* Computed positions: -k'1,3,5,8-9' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -26,7 +26,7 @@
       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
 /* The character set is not based on ISO-646.  */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
 #line 4 "strings_ashkenazi.gperf"
@@ -35,12 +35,12 @@ error "gperf generated tables don't work
 #line 7 "strings_ashkenazi.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 54
+#define TOTAL_KEYWORDS 55
 #define MIN_WORD_LENGTH 5
 #define MAX_WORD_LENGTH 25
 #define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 85
-/* maximum key range = 80, duplicates = 0 */
+#define MAX_HASH_VALUE 95
+/* maximum key range = 90, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -50,38 +50,36 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register size_t len)
 {
   static unsigned char asso_values[] =
     {
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86,  5,  0, 86, 86, 86, 86, 86, 10,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86,  0,  0, 10,  5, 10,
-       0, 86, 30,  0,  0,  0,  5,  0, 86, 40,
-      10, 35, 86,  0,  5,  0, 25, 50, 86,  0,
-      86,  0, 86, 86, 86, 86, 86,  0,  0,  0,
-      10, 30,  5, 86, 40, 35,  0,  0,  0,  5,
-      15,  0,  5, 86,  5,  5, 20,  0, 40,  0,
-      86, 30,  5, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-      86, 86, 86, 86, 86, 86, 86
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96,  0,  5, 96, 96, 96, 96, 96, 15,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96,  0,  5, 15, 10,  0,
+       5, 96, 25,  0,  0,  0, 20, 10, 96, 30,
+       0, 10, 96,  5,  0,  5, 30, 50, 96,  5,
+      96,  0, 96, 96, 96, 96, 96,  5, 10,  0,
+       0, 35, 10, 96, 35,  0, 20,  0, 15,  5,
+       5,  0,  5, 96, 20, 10, 15,  0, 45,  5,
+      96, 25,  0, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+      96, 96, 96, 96, 96, 96, 96
     };
   register unsigned int hval = len;
 
@@ -111,129 +109,132 @@ hash (str, len)
 }
 
 struct event_title *
-hebcal_lookup_ashkenazi (str, len)
-     register const char *str;
-     register unsigned int len;
+hebcal_lookup_ashkenazi (register const char *str, register size_t len)
 {
   static struct event_title wordlist[] =
     {
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 15 "strings_ashkenazi.gperf"
-      {"Makkot","Makkos"},
-#line 10 "strings_ashkenazi.gperf"
-      {"Shabbat","Shabbos"},
-#line 48 "strings_ashkenazi.gperf"
-      {"Sukkot I","Sukkos I"},
-#line 49 "strings_ashkenazi.gperf"
-      {"Sukkot II","Sukkos II"},
-      {""},
-#line 58 "strings_ashkenazi.gperf"
-      {"Toldot","Toldos"},
+#line 34 "strings_ashkenazi.gperf"
+      {"Tazria","Sazria"},
+#line 31 "strings_ashkenazi.gperf"
+      {"Ki Tisa","Ki Sisa"},
+      {""}, {""}, {""},
+#line 11 "strings_ashkenazi.gperf"
+      {"Taanit","Taanis"},
 #line 29 "strings_ashkenazi.gperf"
       {"Ki Tavo","Ki Savo"},
+#line 49 "strings_ashkenazi.gperf"
+      {"Sukkot I","Sukkos I"},
+#line 50 "strings_ashkenazi.gperf"
+      {"Sukkot II","Sukkos II"},
       {""},
+#line 15 "strings_ashkenazi.gperf"
+      {"Makkot","Makkos"},
 #line 43 "strings_ashkenazi.gperf"
-      {"Shavuot I","Shavuos I"},
+      {"Shavuot","Shavuos"},
+      {""},
 #line 44 "strings_ashkenazi.gperf"
+      {"Shavuot I","Shavuos I"},
+#line 45 "strings_ashkenazi.gperf"
       {"Shavuot II","Shavuos II"},
-#line 26 "strings_ashkenazi.gperf"
-      {"Chukat","Chukas"},
-#line 50 "strings_ashkenazi.gperf"
-      {"Sukkot II (CH''M)","Sukkos II (CH''M)"},
+#line 59 "strings_ashkenazi.gperf"
+      {"Toldot","Toldos"},
 #line 51 "strings_ashkenazi.gperf"
+      {"Sukkot II (CH''M)","Sukkos II (CH''M)"},
+#line 52 "strings_ashkenazi.gperf"
       {"Sukkot III (CH''M)","Sukkos III (CH''M)"},
+      {""},
+#line 61 "strings_ashkenazi.gperf"
+      {"Yitro","Yisro"},
+#line 26 "strings_ashkenazi.gperf"
+      {"Chukat","Chukas"},
+#line 10 "strings_ashkenazi.gperf"
+      {"Shabbat","Shabbos"},
+#line 19 "strings_ashkenazi.gperf"
+      {"Bechorot","Bechoros"},
+#line 47 "strings_ashkenazi.gperf"
+      {"Shmini Atzeret","Shmini Atzeres"},
+#line 21 "strings_ashkenazi.gperf"
+      {"Midot","Midos"},
+      {""},
+#line 13 "strings_ashkenazi.gperf"
+      {"Ketubot","Kesubos"},
+#line 41 "strings_ashkenazi.gperf"
+      {"Shabbat Shuva","Shabbos Shuvah"},
 #line 42 "strings_ashkenazi.gperf"
       {"Shabbat Zachor","Shabbos Zachor"},
 #line 37 "strings_ashkenazi.gperf"
       {"Shabbat HaGadol","Shabbos HaGadol"},
-      {""},
-#line 36 "strings_ashkenazi.gperf"
-      {"Shabbat HaChodesh","Shabbos HaChodesh"},
-#line 41 "strings_ashkenazi.gperf"
-      {"Shabbat Shuva","Shabbos Shuvah"},
-#line 35 "strings_ashkenazi.gperf"
-      {"Shabbat Chazon","Shabbos Chazon"},
-#line 60 "strings_ashkenazi.gperf"
-      {"Yitro","Yisro"},
 #line 40 "strings_ashkenazi.gperf"
       {"Shabbat Shekalim","Shabbos Shekalim"},
-#line 13 "strings_ashkenazi.gperf"
-      {"Ketubot","Kesubos"},
-#line 19 "strings_ashkenazi.gperf"
-      {"Bechorot","Bechoros"},
-      {""},
+#line 36 "strings_ashkenazi.gperf"
+      {"Shabbat HaChodesh","Shabbos HaChodesh"},
+#line 18 "strings_ashkenazi.gperf"
+      {"Menachot","Menachos"},
+#line 58 "strings_ashkenazi.gperf"
+      {"Ta'anit Esther","Ta'anis Esther"},
 #line 23 "strings_ashkenazi.gperf"
       {"Bechukotai","Bechukosai"},
 #line 33 "strings_ashkenazi.gperf"
       {"Purim Katan","Purim Koton"},
 #line 20 "strings_ashkenazi.gperf"
       {"Keritot","Kerisos"},
-#line 9 "strings_ashkenazi.gperf"
-      {"Berachot","Berachos"},
+#line 39 "strings_ashkenazi.gperf"
+      {"Shabbat Parah","Shabbos Parah"},
+#line 35 "strings_ashkenazi.gperf"
+      {"Shabbat Chazon","Shabbos Chazon"},
+#line 32 "strings_ashkenazi.gperf"
+      {"Matot","Matos"},
 #line 46 "strings_ashkenazi.gperf"
-      {"Shmini Atzeret","Shmini Atzeres"},
-#line 21 "strings_ashkenazi.gperf"
-      {"Midot","Midos"},
-#line 45 "strings_ashkenazi.gperf"
       {"Shemot","Shemos"},
 #line 16 "strings_ashkenazi.gperf"
       {"Shevuot","Shevuos"},
-#line 25 "strings_ashkenazi.gperf"
-      {"Bereshit","Bereshis"},
+#line 9 "strings_ashkenazi.gperf"
+      {"Berachot","Berachos"},
       {""},
 #line 14 "strings_ashkenazi.gperf"
       {"Baba Batra","Baba Basra"},
-#line 53 "strings_ashkenazi.gperf"
-      {"Sukkot V (CH''M)","Sukkos V (CH''M)"},
-#line 54 "strings_ashkenazi.gperf"
-      {"Sukkot VI (CH''M)","Sukkos VI (CH''M)"},
-#line 18 "strings_ashkenazi.gperf"
-      {"Menachot","Menachos"},
-      {""},
-#line 32 "strings_ashkenazi.gperf"
-      {"Matot","Matos"},
-#line 11 "strings_ashkenazi.gperf"
-      {"Taanit","Taanis"},
-#line 31 "strings_ashkenazi.gperf"
-      {"Ki Tisa","Ki Sisa"},
-#line 61 "strings_ashkenazi.gperf"
-      {"Parashat","Parshas"},
 #line 57 "strings_ashkenazi.gperf"
-      {"Ta'anit Esther","Ta'anis Esther"},
+      {"Ta'anit Bechorot","Ta'anis Bechoros"},
 #line 55 "strings_ashkenazi.gperf"
-      {"Sukkot VII (Hoshana Raba)","Sukkos VII (Hoshana Raba)"},
-#line 34 "strings_ashkenazi.gperf"
-      {"Tazria","Sazria"},
-#line 12 "strings_ashkenazi.gperf"
-      {"Yevamot","Yevamos"},
-#line 39 "strings_ashkenazi.gperf"
-      {"Shabbat Parah","Shabbos Parah"},
+      {"Sukkot VI (CH''M)","Sukkos VI (CH''M)"},
+#line 62 "strings_ashkenazi.gperf"
+      {"Parashat","Parshas"},
       {""},
 #line 30 "strings_ashkenazi.gperf"
       {"Ki Teitzei","Ki Seitzei"},
-#line 28 "strings_ashkenazi.gperf"
-      {"Erev Sukkot","Erev Sukkos"},
+#line 54 "strings_ashkenazi.gperf"
+      {"Sukkot V (CH''M)","Sukkos V (CH''M)"},
 #line 27 "strings_ashkenazi.gperf"
       {"Erev Shavuot","Erev Shavuos"},
-#line 62 "strings_ashkenazi.gperf"
-      {"Leil Selichot","Leil Selichos"},
+#line 25 "strings_ashkenazi.gperf"
+      {"Bereshit","Bereshis"},
+      {""},
+#line 56 "strings_ashkenazi.gperf"
+      {"Sukkot VII (Hoshana Raba)","Sukkos VII (Hoshana Raba)"},
+#line 28 "strings_ashkenazi.gperf"
+      {"Erev Sukkot","Erev Sukkos"},
+#line 12 "strings_ashkenazi.gperf"
+      {"Yevamot","Yevamos"},
+#line 48 "strings_ashkenazi.gperf"
+      {"Simchat Torah","Simchas Torah"},
       {""},
 #line 38 "strings_ashkenazi.gperf"
       {"Shabbat Nachamu","Shabbos Nachamu"},
-#line 56 "strings_ashkenazi.gperf"
-      {"Ta'anit Bechorot","Ta'anis Bechoros"},
+      {""},
 #line 24 "strings_ashkenazi.gperf"
       {"Beha'alotcha","Beha'aloscha"},
-#line 47 "strings_ashkenazi.gperf"
-      {"Simchat Torah","Simchas Torah"},
+#line 63 "strings_ashkenazi.gperf"
+      {"Leil Selichot","Leil Selichos"},
       {""}, {""}, {""},
-#line 52 "strings_ashkenazi.gperf"
+#line 53 "strings_ashkenazi.gperf"
       {"Sukkot IV (CH''M)","Sukkos IV (CH''M)"},
       {""}, {""}, {""}, {""},
 #line 17 "strings_ashkenazi.gperf"
       {"Horayot","Horayos"},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 59 "strings_ashkenazi.gperf"
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""},
+#line 60 "strings_ashkenazi.gperf"
       {"Vaetchanan","Vaeschanan"},
       {""}, {""}, {""}, {""},
 #line 22 "strings_ashkenazi.gperf"
@@ -242,7 +243,7 @@ hebcal_lookup_ashkenazi (str, len)
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      unsigned int key = hash (str, len);
+      register unsigned int key = hash (str, len);
 
       if (key <= MAX_HASH_VALUE)
         {
--- hebcal-4.20.orig/strings_ashkenazi_litvish.c
+++ hebcal-4.20/strings_ashkenazi_litvish.c
@@ -1,5 +1,5 @@
-/* C code produced by gperf version 3.0.3 */
-/* Command-line: /Library/Developer/CommandLineTools/usr/bin/gperf strings_ashkenazi_litvish.gperf  */
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf strings_ashkenazi_litvish.gperf  */
 /* Computed positions: -k'1,3,5,8-9,11' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -26,7 +26,7 @@
       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
 /* The character set is not based on ISO-646.  */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
 #line 4 "strings_ashkenazi_litvish.gperf"
@@ -35,7 +35,7 @@ error "gperf generated tables don't work
 #line 7 "strings_ashkenazi_litvish.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 189
+#define TOTAL_KEYWORDS 190
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 25
 #define MIN_HASH_VALUE 4
@@ -50,9 +50,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register size_t len)
 {
   static unsigned short asso_values[] =
     {
@@ -62,9 +60,9 @@ hash (str, len)
       511, 511,   0,   0, 511, 511, 511,   0, 511,  70,
         0, 511, 511, 511, 511, 511,  80, 511, 511,   0,
        35,  25,  20,  15,  10,   0,   5, 511, 511,   5,
-      511, 511, 511, 511, 511, 115,  55, 155, 135,  15,
+      511, 511, 511, 511, 511, 115,  55, 155, 150,  15,
         0,  80,   0,   0,   0,  95,   0,  40, 180,   0,
-        5,  75,  65,   0,   0,   0,  10, 140, 511,  50,
+        5,  75,  65,   0,   0,   0,  10, 145, 511,  50,
        30,   0, 511, 511, 511, 511, 511,  30,  10,  15,
         0,  35,  10,   0,  55,  25,  35,   0, 125,  90,
        35, 115,   0,   0,  40,   0,  15,   5,   0, 105,
@@ -115,73 +113,71 @@ hash (str, len)
 }
 
 struct event_title *
-hebcal_lookup_ashkenazi_litvish (str, len)
-     register const char *str;
-     register unsigned int len;
+hebcal_lookup_ashkenazi_litvish (register const char *str, register size_t len)
 {
   static struct event_title wordlist[] =
     {
       {""}, {""}, {""}, {""},
-#line 173 "strings_ashkenazi_litvish.gperf"
+#line 174 "strings_ashkenazi_litvish.gperf"
       {"Sigd","Sigd"},
       {""},
-#line 175 "strings_ashkenazi_litvish.gperf"
+#line 176 "strings_ashkenazi_litvish.gperf"
       {"Sukkot","Sukkos"},
-#line 187 "strings_ashkenazi_litvish.gperf"
+#line 188 "strings_ashkenazi_litvish.gperf"
       {"Tu B'Av","Tu B'ov"},
-#line 176 "strings_ashkenazi_litvish.gperf"
-      {"Sukkot I","Sukkos I"},
 #line 177 "strings_ashkenazi_litvish.gperf"
+      {"Sukkot I","Sukkos I"},
+#line 178 "strings_ashkenazi_litvish.gperf"
       {"Sukkot II","Sukkos II"},
-#line 154 "strings_ashkenazi_litvish.gperf"
+#line 155 "strings_ashkenazi_litvish.gperf"
       {"Tevet","Teyves"},
-#line 128 "strings_ashkenazi_litvish.gperf"
+#line 129 "strings_ashkenazi_litvish.gperf"
       {"Pesach","Peisach"},
       {""},
-#line 129 "strings_ashkenazi_litvish.gperf"
-      {"Pesach I","Peisach I"},
 #line 130 "strings_ashkenazi_litvish.gperf"
+      {"Pesach I","Peisach I"},
+#line 131 "strings_ashkenazi_litvish.gperf"
       {"Pesach II","Peisach II"},
       {""},
 #line 15 "strings_ashkenazi_litvish.gperf"
       {"Sukkah","Sukko"},
-#line 178 "strings_ashkenazi_litvish.gperf"
-      {"Sukkot II (CH''M)","Sukkos II (CH''M)"},
 #line 179 "strings_ashkenazi_litvish.gperf"
+      {"Sukkot II (CH''M)","Sukkos II (CH''M)"},
+#line 180 "strings_ashkenazi_litvish.gperf"
       {"Sukkot III (CH''M)","Sukkos III (CH''M)"},
       {""},
-#line 189 "strings_ashkenazi_litvish.gperf"
+#line 190 "strings_ashkenazi_litvish.gperf"
       {"Tu B'Shvat","Tu BiShvat"},
       {""},
-#line 131 "strings_ashkenazi_litvish.gperf"
-      {"Pesach II (CH''M)","Peisach II (CH''M)"},
 #line 132 "strings_ashkenazi_litvish.gperf"
+      {"Pesach II (CH''M)","Peisach II (CH''M)"},
+#line 133 "strings_ashkenazi_litvish.gperf"
       {"Pesach III (CH''M)","Peisach III (CH''M)"},
-#line 147 "strings_ashkenazi_litvish.gperf"
+#line 148 "strings_ashkenazi_litvish.gperf"
       {"Elul","Elul"},
-#line 137 "strings_ashkenazi_litvish.gperf"
-      {"Pesach VII","Peisach VII"},
 #line 138 "strings_ashkenazi_litvish.gperf"
+      {"Pesach VII","Peisach VII"},
+#line 139 "strings_ashkenazi_litvish.gperf"
       {"Pesach VIII","Peisach VIII"},
-#line 182 "strings_ashkenazi_litvish.gperf"
+#line 183 "strings_ashkenazi_litvish.gperf"
       {"Sukkot VI (CH''M)","Sukkos VI (CH''M)"},
       {""}, {""}, {""}, {""},
-#line 136 "strings_ashkenazi_litvish.gperf"
+#line 137 "strings_ashkenazi_litvish.gperf"
       {"Pesach VI (CH''M)","Peisach VI (CH''M)"},
       {""},
-#line 90 "strings_ashkenazi_litvish.gperf"
+#line 91 "strings_ashkenazi_litvish.gperf"
       {"Tzav","Tzav"},
-#line 183 "strings_ashkenazi_litvish.gperf"
+#line 184 "strings_ashkenazi_litvish.gperf"
       {"Sukkot VII (Hoshana Raba)","Sukkos VII (Heishano Rabo)"},
       {""},
-#line 168 "strings_ashkenazi_litvish.gperf"
+#line 169 "strings_ashkenazi_litvish.gperf"
       {"Shavuot","Shvuos"},
       {""},
-#line 169 "strings_ashkenazi_litvish.gperf"
-      {"Shavuot I","Shvuos I"},
 #line 170 "strings_ashkenazi_litvish.gperf"
+      {"Shavuot I","Shvuos I"},
+#line 171 "strings_ashkenazi_litvish.gperf"
       {"Shavuot II","Shvuos II"},
-#line 83 "strings_ashkenazi_litvish.gperf"
+#line 84 "strings_ashkenazi_litvish.gperf"
       {"Shemot","Shmeis"},
 #line 33 "strings_ashkenazi_litvish.gperf"
       {"Shevuot","Shvuos"},
@@ -190,236 +186,237 @@ hebcal_lookup_ashkenazi_litvish (str, le
       {"Sotah","Seito"},
 #line 32 "strings_ashkenazi_litvish.gperf"
       {"Makkot","Makkos"},
-#line 79 "strings_ashkenazi_litvish.gperf"
+#line 80 "strings_ashkenazi_litvish.gperf"
       {"Pekudei","Pkudey"},
       {""}, {""},
 #line 46 "strings_ashkenazi_litvish.gperf"
       {"Midot","Midos"},
-#line 74 "strings_ashkenazi_litvish.gperf"
+#line 75 "strings_ashkenazi_litvish.gperf"
       {"Miketz","Mikeitz"},
 #line 10 "strings_ashkenazi_litvish.gperf"
       {"Shabbat","Shabbos"},
       {""}, {""},
-#line 188 "strings_ashkenazi_litvish.gperf"
+#line 189 "strings_ashkenazi_litvish.gperf"
       {"Tu BiShvat","Tu BiShvat"},
       {""},
-#line 58 "strings_ashkenazi_litvish.gperf"
+#line 59 "strings_ashkenazi_litvish.gperf"
       {"Bo","Bei"},
       {""}, {""},
-#line 91 "strings_ashkenazi_litvish.gperf"
+#line 92 "strings_ashkenazi_litvish.gperf"
       {"Vaera","Voeiro"},
 #line 11 "strings_ashkenazi_litvish.gperf"
       {"Eruvin","Eiruvin"},
-#line 73 "strings_ashkenazi_litvish.gperf"
+#line 74 "strings_ashkenazi_litvish.gperf"
       {"Metzora","Metzeiro"},
-#line 166 "strings_ashkenazi_litvish.gperf"
+#line 167 "strings_ashkenazi_litvish.gperf"
       {"Shabbat Shuva","Shabbos Shuvo"},
       {""},
-#line 72 "strings_ashkenazi_litvish.gperf"
+#line 73 "strings_ashkenazi_litvish.gperf"
       {"Matot","Matos"},
-#line 186 "strings_ashkenazi_litvish.gperf"
+#line 187 "strings_ashkenazi_litvish.gperf"
       {"Tish'a B'Av","Tisho B'ov"},
       {""}, {""}, {""},
-#line 103 "strings_ashkenazi_litvish.gperf"
+#line 104 "strings_ashkenazi_litvish.gperf"
       {"Yitro","Yisro"},
 #line 17 "strings_ashkenazi_litvish.gperf"
       {"Taanit","Taanis"},
-#line 80 "strings_ashkenazi_litvish.gperf"
+#line 81 "strings_ashkenazi_litvish.gperf"
       {"Pinchas","Pinchos"},
-#line 125 "strings_ashkenazi_litvish.gperf"
+#line 126 "strings_ashkenazi_litvish.gperf"
       {"Havdalah","Havdolo"},
-#line 167 "strings_ashkenazi_litvish.gperf"
+#line 168 "strings_ashkenazi_litvish.gperf"
       {"Shabbat Zachor","Shabbos Zochor"},
-#line 162 "strings_ashkenazi_litvish.gperf"
+#line 163 "strings_ashkenazi_litvish.gperf"
       {"Shabbat Nachamu","Shabbos Nachamu"},
       {""},
-#line 134 "strings_ashkenazi_litvish.gperf"
+#line 135 "strings_ashkenazi_litvish.gperf"
       {"Pesach Sheni","Peisach Sheini"},
       {""}, {""},
-#line 71 "strings_ashkenazi_litvish.gperf"
+#line 72 "strings_ashkenazi_litvish.gperf"
       {"Masei","Masei"},
 #line 43 "strings_ashkenazi_litvish.gperf"
       {"Meilah","Meilo"},
-#line 87 "strings_ashkenazi_litvish.gperf"
+#line 88 "strings_ashkenazi_litvish.gperf"
       {"Terumah","Trumo"},
-#line 49 "strings_ashkenazi_litvish.gperf"
+#line 50 "strings_ashkenazi_litvish.gperf"
       {"Parashat","Parshas"},
       {""},
-#line 139 "strings_ashkenazi_litvish.gperf"
+#line 140 "strings_ashkenazi_litvish.gperf"
       {"Purim","Purim"},
-#line 151 "strings_ashkenazi_litvish.gperf"
+#line 152 "strings_ashkenazi_litvish.gperf"
       {"Sh'vat","Shvat"},
-#line 82 "strings_ashkenazi_litvish.gperf"
+#line 83 "strings_ashkenazi_litvish.gperf"
       {"Sh'lach","Shlach"},
-#line 88 "strings_ashkenazi_litvish.gperf"
+#line 89 "strings_ashkenazi_litvish.gperf"
       {"Tetzaveh","Tetzave"},
       {""},
 #line 30 "strings_ashkenazi_litvish.gperf"
       {"Baba Batra","Bovo Basro"},
-#line 164 "strings_ashkenazi_litvish.gperf"
+#line 165 "strings_ashkenazi_litvish.gperf"
       {"Shabbat Reish Chodesh","Shabbos Reish Cheidesh"},
 #line 21 "strings_ashkenazi_litvish.gperf"
       {"Yevamot","Yevomos"},
 #line 39 "strings_ashkenazi_litvish.gperf"
       {"Bechorot","Bcheiros"},
       {""},
-#line 148 "strings_ashkenazi_litvish.gperf"
+#line 149 "strings_ashkenazi_litvish.gperf"
       {"Iyyar","Iyyor"},
-#line 165 "strings_ashkenazi_litvish.gperf"
+#line 166 "strings_ashkenazi_litvish.gperf"
       {"Shabbat Shekalim","Shabbos Shkolim"},
 #line 41 "strings_ashkenazi_litvish.gperf"
       {"Temurah","Tmuro"},
 #line 37 "strings_ashkenazi_litvish.gperf"
       {"Menachot","Menochos"},
       {""},
-#line 92 "strings_ashkenazi_litvish.gperf"
+#line 93 "strings_ashkenazi_litvish.gperf"
       {"Vaetchanan","Voeschanan"},
       {""}, {""},
 #line 12 "strings_ashkenazi_litvish.gperf"
       {"Pesachim","Psochim"},
       {""},
-#line 53 "strings_ashkenazi_litvish.gperf"
+#line 54 "strings_ashkenazi_litvish.gperf"
       {"Bechukotai","Bechukeisai"},
-#line 96 "strings_ashkenazi_litvish.gperf"
+#line 97 "strings_ashkenazi_litvish.gperf"
       {"Vayera","Vayeiro"},
-#line 94 "strings_ashkenazi_litvish.gperf"
+#line 95 "strings_ashkenazi_litvish.gperf"
       {"Vayechi","Vayechi"},
-#line 119 "strings_ashkenazi_litvish.gperf"
+#line 120 "strings_ashkenazi_litvish.gperf"
       {"Erev Reish Hashana","Erev Reish-Hashono"},
-#line 75 "strings_ashkenazi_litvish.gperf"
+#line 76 "strings_ashkenazi_litvish.gperf"
       {"Mishpatim","Mishpotim"},
 #line 19 "strings_ashkenazi_litvish.gperf"
       {"Moed Katan","Meyed Koton"},
-#line 149 "strings_ashkenazi_litvish.gperf"
+#line 150 "strings_ashkenazi_litvish.gperf"
       {"Kislev","Kislev"},
-#line 66 "strings_ashkenazi_litvish.gperf"
+#line 67 "strings_ashkenazi_litvish.gperf"
       {"Ki Tavo","Ki-Sovo"},
       {""},
-#line 57 "strings_ashkenazi_litvish.gperf"
+#line 58 "strings_ashkenazi_litvish.gperf"
       {"Beshalach","Beshalach"},
-#line 55 "strings_ashkenazi_litvish.gperf"
+#line 56 "strings_ashkenazi_litvish.gperf"
       {"Behar","Behar"},
       {""},
-#line 145 "strings_ashkenazi_litvish.gperf"
+#line 146 "strings_ashkenazi_litvish.gperf"
       {"Av","Ov"},
 #line 9 "strings_ashkenazi_litvish.gperf"
       {"Berachot","Brochos"},
       {""},
-#line 152 "strings_ashkenazi_litvish.gperf"
+#line 153 "strings_ashkenazi_litvish.gperf"
       {"Sivan","Sivon"},
-#line 123 "strings_ashkenazi_litvish.gperf"
+#line 124 "strings_ashkenazi_litvish.gperf"
       {"Erev Tish'a B'Av","Erev Tisho Bov"},
       {""},
-#line 97 "strings_ashkenazi_litvish.gperf"
+#line 98 "strings_ashkenazi_litvish.gperf"
       {"Vayeshev","Vayeishev"},
       {""},
-#line 62 "strings_ashkenazi_litvish.gperf"
+#line 63 "strings_ashkenazi_litvish.gperf"
       {"Eikev","Eikev"},
-#line 117 "strings_ashkenazi_litvish.gperf"
+#line 118 "strings_ashkenazi_litvish.gperf"
       {"Erev Pesach","Erev Peisach"},
-#line 85 "strings_ashkenazi_litvish.gperf"
+#line 86 "strings_ashkenazi_litvish.gperf"
       {"Shoftim","Shoftim"},
 #line 36 "strings_ashkenazi_litvish.gperf"
       {"Zevachim","Zvochim"},
       {""},
 #line 45 "strings_ashkenazi_litvish.gperf"
       {"Tamid","Tomid"},
-#line 89 "strings_ashkenazi_litvish.gperf"
+#line 90 "strings_ashkenazi_litvish.gperf"
       {"Toldot","Toldos"},
 #line 22 "strings_ashkenazi_litvish.gperf"
       {"Ketubot","Ksubos"},
-#line 56 "strings_ashkenazi_litvish.gperf"
+#line 57 "strings_ashkenazi_litvish.gperf"
       {"Bereshit","Breishis"},
-#line 63 "strings_ashkenazi_litvish.gperf"
+#line 64 "strings_ashkenazi_litvish.gperf"
       {"Emor","Emor"},
-#line 118 "strings_ashkenazi_litvish.gperf"
+#line 119 "strings_ashkenazi_litvish.gperf"
       {"Erev Purim","Erev Purim"},
       {""},
-#line 68 "strings_ashkenazi_litvish.gperf"
+#line 69 "strings_ashkenazi_litvish.gperf"
       {"Ki Tisa","Ki-Siso"},
-#line 98 "strings_ashkenazi_litvish.gperf"
+#line 99 "strings_ashkenazi_litvish.gperf"
       {"Vayetzei","Vayeitzei"},
       {""},
-#line 160 "strings_ashkenazi_litvish.gperf"
+#line 161 "strings_ashkenazi_litvish.gperf"
       {"Shabbat HaGadol","Shabbos HaGodol"},
-#line 69 "strings_ashkenazi_litvish.gperf"
+#line 70 "strings_ashkenazi_litvish.gperf"
       {"Korach","Keirach"},
-#line 61 "strings_ashkenazi_litvish.gperf"
-      {"Devarim","Dvorim"},
+      {""},
 #line 13 "strings_ashkenazi_litvish.gperf"
       {"Shekalim","Shkolim"},
 #line 14 "strings_ashkenazi_litvish.gperf"
       {"Yoma","Yumo"},
-#line 70 "strings_ashkenazi_litvish.gperf"
+#line 71 "strings_ashkenazi_litvish.gperf"
       {"Lech-Lecha","Lech-Lecho"},
       {""},
 #line 42 "strings_ashkenazi_litvish.gperf"
       {"Keritot","Krisos"},
       {""},
-#line 142 "strings_ashkenazi_litvish.gperf"
+#line 143 "strings_ashkenazi_litvish.gperf"
       {"Adar","Odor"},
-#line 195 "strings_ashkenazi_litvish.gperf"
+#line 196 "strings_ashkenazi_litvish.gperf"
       {"Yom Kippur","Yom Kippur"},
-#line 143 "strings_ashkenazi_litvish.gperf"
-      {"Adar I","Odor Aleph"},
 #line 144 "strings_ashkenazi_litvish.gperf"
+      {"Adar I","Odor Aleph"},
+#line 145 "strings_ashkenazi_litvish.gperf"
       {"Adar II","Odor Beis"},
       {""}, {""},
-#line 101 "strings_ashkenazi_litvish.gperf"
+#line 102 "strings_ashkenazi_litvish.gperf"
       {"Vayishlach","Vayishlach"},
       {""},
-#line 180 "strings_ashkenazi_litvish.gperf"
-      {"Sukkot IV (CH''M)","Sukkos IV (CH''M)"},
-#line 172 "strings_ashkenazi_litvish.gperf"
+#line 62 "strings_ashkenazi_litvish.gperf"
+      {"Devarim","Dvorim"},
+#line 173 "strings_ashkenazi_litvish.gperf"
       {"Shushan Purim","Shushon Purim"},
       {""}, {""},
-#line 140 "strings_ashkenazi_litvish.gperf"
+#line 141 "strings_ashkenazi_litvish.gperf"
       {"Purim Katan","Purim Koton"},
-#line 133 "strings_ashkenazi_litvish.gperf"
-      {"Pesach IV (CH''M)","Peisach IV (CH''M)"},
-#line 190 "strings_ashkenazi_litvish.gperf"
+#line 181 "strings_ashkenazi_litvish.gperf"
+      {"Sukkot IV (CH''M)","Sukkos IV (CH''M)"},
+#line 191 "strings_ashkenazi_litvish.gperf"
       {"Tzom Gedaliah","Tzom Gdalyo"},
       {""},
-#line 81 "strings_ashkenazi_litvish.gperf"
+#line 82 "strings_ashkenazi_litvish.gperf"
       {"Re'eh","Reei"},
-      {""}, {""},
-#line 174 "strings_ashkenazi_litvish.gperf"
+      {""},
+#line 134 "strings_ashkenazi_litvish.gperf"
+      {"Pesach IV (CH''M)","Peisach IV (CH''M)"},
+#line 175 "strings_ashkenazi_litvish.gperf"
       {"Simchat Torah","Simchas Teiro"},
       {""}, {""},
 #line 44 "strings_ashkenazi_litvish.gperf"
       {"Kinnim","Kinnim"},
       {""},
-#line 163 "strings_ashkenazi_litvish.gperf"
+#line 164 "strings_ashkenazi_litvish.gperf"
       {"Shabbat Parah","Shabbos Poro"},
       {""}, {""},
-#line 60 "strings_ashkenazi_litvish.gperf"
+#line 61 "strings_ashkenazi_litvish.gperf"
       {"Chukat","Chukas"},
 #line 40 "strings_ashkenazi_litvish.gperf"
       {"Arachin","Arochin"},
-#line 64 "strings_ashkenazi_litvish.gperf"
+#line 65 "strings_ashkenazi_litvish.gperf"
       {"Ha'Azinu","Haazinu"},
       {""},
-#line 124 "strings_ashkenazi_litvish.gperf"
+#line 125 "strings_ashkenazi_litvish.gperf"
       {"Erev Yom Kippur","Erev Yom Kippur"},
-#line 181 "strings_ashkenazi_litvish.gperf"
+#line 182 "strings_ashkenazi_litvish.gperf"
       {"Sukkot V (CH''M)","Sukkos V (CH''M)"},
 #line 16 "strings_ashkenazi_litvish.gperf"
       {"Beitzah","Beitzo"},
       {""},
-#line 95 "strings_ashkenazi_litvish.gperf"
+#line 96 "strings_ashkenazi_litvish.gperf"
       {"Vayeilech","Vayeilech"},
-#line 76 "strings_ashkenazi_litvish.gperf"
+#line 77 "strings_ashkenazi_litvish.gperf"
       {"Nasso","Nosso"},
-#line 135 "strings_ashkenazi_litvish.gperf"
+#line 136 "strings_ashkenazi_litvish.gperf"
       {"Pesach V (CH''M)","Peisach V (CH''M)"},
 #line 23 "strings_ashkenazi_litvish.gperf"
       {"Nedarim","Nedorim"},
-#line 121 "strings_ashkenazi_litvish.gperf"
+#line 122 "strings_ashkenazi_litvish.gperf"
       {"Erev Simchat Torah","Erev Simchas Teiro"},
       {""},
-#line 153 "strings_ashkenazi_litvish.gperf"
+#line 154 "strings_ashkenazi_litvish.gperf"
       {"Tamuz","Tamuz"},
-#line 86 "strings_ashkenazi_litvish.gperf"
+#line 87 "strings_ashkenazi_litvish.gperf"
       {"Tazria","Tazria"},
       {""},
 #line 18 "strings_ashkenazi_litvish.gperf"
@@ -434,132 +431,132 @@ hebcal_lookup_ashkenazi_litvish (str, le
       {""}, {""},
 #line 28 "strings_ashkenazi_litvish.gperf"
       {"Baba Kamma","Bovo Kamo"},
-#line 122 "strings_ashkenazi_litvish.gperf"
+#line 123 "strings_ashkenazi_litvish.gperf"
       {"Erev Sukkot","Erev Sukkos"},
       {""},
-#line 155 "strings_ashkenazi_litvish.gperf"
+#line 156 "strings_ashkenazi_litvish.gperf"
       {"Reish Hashana","Reish Hashono"},
       {""},
-#line 156 "strings_ashkenazi_litvish.gperf"
-      {"Reish Hashana I","Reish Hashono I"},
 #line 157 "strings_ashkenazi_litvish.gperf"
+      {"Reish Hashana I","Reish Hashono I"},
+#line 158 "strings_ashkenazi_litvish.gperf"
       {"Reish Hashana II","Reish Hashono II"},
       {""},
-#line 65 "strings_ashkenazi_litvish.gperf"
+#line 66 "strings_ashkenazi_litvish.gperf"
       {"Kedoshim","Kdeishim"},
       {""}, {""},
-#line 84 "strings_ashkenazi_litvish.gperf"
+#line 85 "strings_ashkenazi_litvish.gperf"
       {"Shmini","Shmini"},
       {""}, {""},
-#line 185 "strings_ashkenazi_litvish.gperf"
+#line 186 "strings_ashkenazi_litvish.gperf"
       {"Ta'anit Esther","Taanis Ester"},
 #line 26 "strings_ashkenazi_litvish.gperf"
       {"Gitin","Gitin"},
 #line 29 "strings_ashkenazi_litvish.gperf"
       {"Baba Metzia","Bovo Metzio"},
-#line 159 "strings_ashkenazi_litvish.gperf"
+#line 160 "strings_ashkenazi_litvish.gperf"
       {"Shabbat HaChodesh","Shabbos HaCheidesh"},
-#line 99 "strings_ashkenazi_litvish.gperf"
+#line 100 "strings_ashkenazi_litvish.gperf"
       {"Vayigash","Vayigash"},
-      {""},
-#line 48 "strings_ashkenazi_litvish.gperf"
-      {"Daf Yomi: %s %d","Daf Yeimi: %s %d"},
-#line 141 "strings_ashkenazi_litvish.gperf"
-      {"Reish Chodesh %s","Reish Cheidesh %s"},
       {""}, {""},
-#line 158 "strings_ashkenazi_litvish.gperf"
-      {"Shabbat Chazon","Shabbos Chazon"},
-      {""}, {""}, {""},
-#line 52 "strings_ashkenazi_litvish.gperf"
+#line 142 "strings_ashkenazi_litvish.gperf"
+      {"Reish Chodesh %s","Reish Cheidesh %s"},
+      {""},
+#line 49 "strings_ashkenazi_litvish.gperf"
+      {"Daf Yomi","Daf Yeimi"},
+      {""}, {""}, {""}, {""},
+#line 53 "strings_ashkenazi_litvish.gperf"
       {"Bamidbar","Bamidbor"},
       {""},
-#line 50 "strings_ashkenazi_litvish.gperf"
+#line 51 "strings_ashkenazi_litvish.gperf"
       {"Achrei Mot","Achrei"},
       {""},
-#line 100 "strings_ashkenazi_litvish.gperf"
+#line 101 "strings_ashkenazi_litvish.gperf"
       {"Vayikra","Vayikro"},
-      {""}, {""}, {""},
-#line 196 "strings_ashkenazi_litvish.gperf"
+      {""}, {""},
+#line 48 "strings_ashkenazi_litvish.gperf"
+      {"Daf Yomi: %s %d","Daf Yeimi: %s %d"},
+#line 197 "strings_ashkenazi_litvish.gperf"
       {"Yom Yerushalayim","Yom Yerusholayim"},
       {""},
-#line 104 "strings_ashkenazi_litvish.gperf"
+#line 105 "strings_ashkenazi_litvish.gperf"
       {"Asara B'Tevet","Asoro Beteyves"},
-      {""},
-#line 78 "strings_ashkenazi_litvish.gperf"
+#line 159 "strings_ashkenazi_litvish.gperf"
+      {"Shabbat Chazon","Shabbos Chazon"},
+#line 79 "strings_ashkenazi_litvish.gperf"
       {"Noach","Neiach"},
       {""}, {""}, {""},
 #line 27 "strings_ashkenazi_litvish.gperf"
       {"Kiddushin","Kiddushin"},
       {""},
-#line 59 "strings_ashkenazi_litvish.gperf"
+#line 60 "strings_ashkenazi_litvish.gperf"
       {"Chayei Sara","Chayei Soro"},
       {""},
-#line 106 "strings_ashkenazi_litvish.gperf"
+#line 107 "strings_ashkenazi_litvish.gperf"
       {"Chanukah","Chanukko"},
       {""}, {""}, {""}, {""},
-#line 127 "strings_ashkenazi_litvish.gperf"
+#line 128 "strings_ashkenazi_litvish.gperf"
       {"Leil Selichot","Slichos"},
       {""}, {""}, {""},
 #line 38 "strings_ashkenazi_litvish.gperf"
       {"Chullin","Chullin"},
-#line 146 "strings_ashkenazi_litvish.gperf"
+#line 147 "strings_ashkenazi_litvish.gperf"
       {"Cheshvan","Cheshvon"},
       {""}, {""},
-#line 193 "strings_ashkenazi_litvish.gperf"
+#line 194 "strings_ashkenazi_litvish.gperf"
       {"Yom HaShoah","Yom HaShoah"},
-#line 161 "strings_ashkenazi_litvish.gperf"
+#line 162 "strings_ashkenazi_litvish.gperf"
       {"Shabbat Machar Chodesh","Shabbos Mochor Cheidesh"},
-#line 107 "strings_ashkenazi_litvish.gperf"
+#line 108 "strings_ashkenazi_litvish.gperf"
       {"Chanukah: 1 Candle","Chanukko: 1 Candle"},
-#line 113 "strings_ashkenazi_litvish.gperf"
+#line 114 "strings_ashkenazi_litvish.gperf"
       {"Chanukah: 7 Candles","Chanukko: 7 Candles"},
-#line 126 "strings_ashkenazi_litvish.gperf"
+#line 127 "strings_ashkenazi_litvish.gperf"
       {"Lag BaOmer","Lag Beimer"},
-#line 102 "strings_ashkenazi_litvish.gperf"
+#line 103 "strings_ashkenazi_litvish.gperf"
       {"Vezot Haberakhah","Zeis Habrocho"},
-#line 115 "strings_ashkenazi_litvish.gperf"
+#line 116 "strings_ashkenazi_litvish.gperf"
       {"Chanukah: 8th Day","Chanukko: 8th Day"},
       {""},
-#line 114 "strings_ashkenazi_litvish.gperf"
+#line 115 "strings_ashkenazi_litvish.gperf"
       {"Chanukah: 8 Candles","Chanukko: 8 Candles"},
       {""}, {""}, {""}, {""},
-#line 112 "strings_ashkenazi_litvish.gperf"
+#line 113 "strings_ashkenazi_litvish.gperf"
       {"Chanukah: 6 Candles","Chanukko: 6 Candles"},
-#line 67 "strings_ashkenazi_litvish.gperf"
+#line 68 "strings_ashkenazi_litvish.gperf"
       {"Ki Teitzei","Ki-Seitzei"},
       {""}, {""}, {""},
-#line 111 "strings_ashkenazi_litvish.gperf"
+#line 112 "strings_ashkenazi_litvish.gperf"
       {"Chanukah: 5 Candles","Chanukko: 5 Candles"},
-      {""},
-#line 116 "strings_ashkenazi_litvish.gperf"
-      {"Days of the Omer","Eimer"},
-      {""},
+      {""}, {""}, {""},
 #line 20 "strings_ashkenazi_litvish.gperf"
       {"Chagigah","Chagigo"},
-#line 110 "strings_ashkenazi_litvish.gperf"
+#line 111 "strings_ashkenazi_litvish.gperf"
       {"Chanukah: 4 Candles","Chanukko: 4 Candles"},
       {""}, {""}, {""}, {""},
-#line 109 "strings_ashkenazi_litvish.gperf"
+#line 110 "strings_ashkenazi_litvish.gperf"
       {"Chanukah: 3 Candles","Chanukko: 3 Candles"},
       {""}, {""}, {""}, {""},
-#line 192 "strings_ashkenazi_litvish.gperf"
+#line 193 "strings_ashkenazi_litvish.gperf"
       {"Yom HaAtzma'ut","Yom HaAtzma'ut"},
-      {""}, {""},
-#line 54 "strings_ashkenazi_litvish.gperf"
+      {""},
+#line 117 "strings_ashkenazi_litvish.gperf"
+      {"Days of the Omer","Eimer"},
+#line 55 "strings_ashkenazi_litvish.gperf"
       {"Beha'alotcha","Bahaaloscho"},
       {""},
-#line 108 "strings_ashkenazi_litvish.gperf"
+#line 109 "strings_ashkenazi_litvish.gperf"
       {"Chanukah: 2 Candles","Chanukko: 2 Candles"},
-#line 150 "strings_ashkenazi_litvish.gperf"
+#line 151 "strings_ashkenazi_litvish.gperf"
       {"Nisan","Nison"},
       {""}, {""},
-#line 77 "strings_ashkenazi_litvish.gperf"
+#line 78 "strings_ashkenazi_litvish.gperf"
       {"Nitzavim","Nitzovim"},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 51 "strings_ashkenazi_litvish.gperf"
+#line 52 "strings_ashkenazi_litvish.gperf"
       {"Balak","Bolok"},
       {""},
-#line 120 "strings_ashkenazi_litvish.gperf"
+#line 121 "strings_ashkenazi_litvish.gperf"
       {"Erev Shavuot","Erev Shvuos"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
 #line 34 "strings_ashkenazi_litvish.gperf"
@@ -569,25 +566,25 @@ hebcal_lookup_ashkenazi_litvish (str, le
 #line 24 "strings_ashkenazi_litvish.gperf"
       {"Nazir","Nozir"},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 197 "strings_ashkenazi_litvish.gperf"
+#line 198 "strings_ashkenazi_litvish.gperf"
       {"Yom HaAliyah","Yom HaAliyah"},
-#line 194 "strings_ashkenazi_litvish.gperf"
+#line 195 "strings_ashkenazi_litvish.gperf"
       {"Yom HaZikaron","Yom HaZikaron"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""},
-#line 93 "strings_ashkenazi_litvish.gperf"
+#line 94 "strings_ashkenazi_litvish.gperf"
       {"Vayakhel","Vayakhel"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""},
-#line 184 "strings_ashkenazi_litvish.gperf"
+#line 185 "strings_ashkenazi_litvish.gperf"
       {"Ta'anit Bechorot","Taanis Bchoros"},
       {""}, {""},
-#line 171 "strings_ashkenazi_litvish.gperf"
+#line 172 "strings_ashkenazi_litvish.gperf"
       {"Shmini Atzeret","Shmini Atzeres"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 191 "strings_ashkenazi_litvish.gperf"
+#line 192 "strings_ashkenazi_litvish.gperf"
       {"Tzom Tammuz","Tzom Tammuz"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -601,13 +598,13 @@ hebcal_lookup_ashkenazi_litvish (str, le
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 105 "strings_ashkenazi_litvish.gperf"
+#line 106 "strings_ashkenazi_litvish.gperf"
       {"Candle lighting","Hadlokas neyros"}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      unsigned int key = hash (str, len);
+      register unsigned int key = hash (str, len);
 
       if (key <= MAX_HASH_VALUE)
         {
--- hebcal-4.20.orig/strings_ashkenazi_poylish.c
+++ hebcal-4.20/strings_ashkenazi_poylish.c
@@ -35,7 +35,7 @@
 #line 7 "strings_ashkenazi_poylish.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 189
+#define TOTAL_KEYWORDS 191
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 25
 #define MIN_HASH_VALUE 4
@@ -61,11 +61,11 @@ hash (register const char *str, register
         0, 461, 461, 461, 461, 461,   5, 461, 461,   0,
        45,  40,  35,  20,  15,  10,   0, 461, 461,   0,
       461, 461, 461, 461, 461,  75,  55,  90, 135,  15,
-        5, 110,  45,   0,   0,  80,   5,  40, 140,   5,
+        5, 110,  45,   0,   0,  80,   5,  40, 140,  10,
         5,  35,  70,   0,   0,   5,  10, 165, 461, 125,
        10,   0, 461, 461, 461, 461, 461,  30,  10,  15,
         0,  35,  65,   0,  80,   5,  80,   0,  75,  55,
-       65, 100,   0,   5,   0,   0,  20,   5,   0,  25,
+       65, 100,   0,   5,   0,   0,  20,   5,   0,  60,
       461,  85, 110, 125, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
@@ -118,189 +118,189 @@ hebcal_lookup_ashkenazi_poylish (registe
   static struct event_title wordlist[] =
     {
       {""}, {""}, {""}, {""},
-#line 173 "strings_ashkenazi_poylish.gperf"
+#line 175 "strings_ashkenazi_poylish.gperf"
       {"Sigd","Sigd"},
       {""},
-#line 175 "strings_ashkenazi_poylish.gperf"
+#line 177 "strings_ashkenazi_poylish.gperf"
       {"Sukkot","Sukkos"},
-#line 187 "strings_ashkenazi_poylish.gperf"
+#line 189 "strings_ashkenazi_poylish.gperf"
       {"Tu B'Av","Tu B'ov"},
-#line 176 "strings_ashkenazi_poylish.gperf"
+#line 178 "strings_ashkenazi_poylish.gperf"
       {"Sukkot I","Sukkos I"},
-#line 177 "strings_ashkenazi_poylish.gperf"
+#line 179 "strings_ashkenazi_poylish.gperf"
       {"Sukkot II","Sukkos II"},
-#line 154 "strings_ashkenazi_poylish.gperf"
+#line 156 "strings_ashkenazi_poylish.gperf"
       {"Tevet","Teyves"},
-#line 128 "strings_ashkenazi_poylish.gperf"
+#line 129 "strings_ashkenazi_poylish.gperf"
       {"Pesach","Peisach"},
       {""},
-#line 129 "strings_ashkenazi_poylish.gperf"
-      {"Pesach I","Peisach I"},
 #line 130 "strings_ashkenazi_poylish.gperf"
+      {"Pesach I","Peisach I"},
+#line 131 "strings_ashkenazi_poylish.gperf"
       {"Pesach II","Peisach II"},
       {""},
 #line 15 "strings_ashkenazi_poylish.gperf"
       {"Sukkah","Sikku"},
-#line 178 "strings_ashkenazi_poylish.gperf"
+#line 180 "strings_ashkenazi_poylish.gperf"
       {"Sukkot II (CH''M)","Sukkos II (CH''M)"},
-#line 179 "strings_ashkenazi_poylish.gperf"
+#line 181 "strings_ashkenazi_poylish.gperf"
       {"Sukkot III (CH''M)","Sukkos III (CH''M)"},
       {""},
-#line 189 "strings_ashkenazi_poylish.gperf"
+#line 191 "strings_ashkenazi_poylish.gperf"
       {"Tu B'Shvat","Tu BiShvat"},
       {""},
-#line 131 "strings_ashkenazi_poylish.gperf"
-      {"Pesach II (CH''M)","Peisach II (CH''M)"},
 #line 132 "strings_ashkenazi_poylish.gperf"
+      {"Pesach II (CH''M)","Peisach II (CH''M)"},
+#line 133 "strings_ashkenazi_poylish.gperf"
       {"Pesach III (CH''M)","Peisach III (CH''M)"},
-#line 147 "strings_ashkenazi_poylish.gperf"
+#line 149 "strings_ashkenazi_poylish.gperf"
       {"Elul","Elul"},
-#line 137 "strings_ashkenazi_poylish.gperf"
-      {"Pesach VII","Peisach VII"},
 #line 138 "strings_ashkenazi_poylish.gperf"
+      {"Pesach VII","Peisach VII"},
+#line 139 "strings_ashkenazi_poylish.gperf"
       {"Pesach VIII","Peisach VIII"},
-#line 182 "strings_ashkenazi_poylish.gperf"
+#line 184 "strings_ashkenazi_poylish.gperf"
       {"Sukkot VI (CH''M)","Sukkos VI (CH''M)"},
       {""}, {""},
 #line 25 "strings_ashkenazi_poylish.gperf"
       {"Sotah","Soytu"},
       {""},
-#line 136 "strings_ashkenazi_poylish.gperf"
+#line 137 "strings_ashkenazi_poylish.gperf"
       {"Pesach VI (CH''M)","Peisach VI (CH''M)"},
       {""},
-#line 90 "strings_ashkenazi_poylish.gperf"
+#line 91 "strings_ashkenazi_poylish.gperf"
       {"Tzav","Tzav"},
-#line 183 "strings_ashkenazi_poylish.gperf"
+#line 185 "strings_ashkenazi_poylish.gperf"
       {"Sukkot VII (Hoshana Raba)","Sukkos VII (Hoyshano Rabo)"},
       {""},
-#line 168 "strings_ashkenazi_poylish.gperf"
+#line 170 "strings_ashkenazi_poylish.gperf"
       {"Shavuot","Shvuos"},
       {""},
-#line 169 "strings_ashkenazi_poylish.gperf"
+#line 171 "strings_ashkenazi_poylish.gperf"
       {"Shavuot I","Shvuos I"},
-#line 170 "strings_ashkenazi_poylish.gperf"
+#line 172 "strings_ashkenazi_poylish.gperf"
       {"Shavuot II","Shvuos II"},
-#line 83 "strings_ashkenazi_poylish.gperf"
+#line 84 "strings_ashkenazi_poylish.gperf"
       {"Shemot","Shmoys"},
 #line 33 "strings_ashkenazi_poylish.gperf"
       {"Shevuot","Shvios"},
-      {""}, {""},
-#line 62 "strings_ashkenazi_poylish.gperf"
-      {"Eikev","Aikev"},
+      {""}, {""}, {""},
 #line 32 "strings_ashkenazi_poylish.gperf"
       {"Makkot","Makkos"},
-#line 79 "strings_ashkenazi_poylish.gperf"
+#line 80 "strings_ashkenazi_poylish.gperf"
       {"Pekudei","Pkudey"},
       {""}, {""},
 #line 46 "strings_ashkenazi_poylish.gperf"
       {"Midot","Midos"},
-#line 74 "strings_ashkenazi_poylish.gperf"
+#line 75 "strings_ashkenazi_poylish.gperf"
       {"Miketz","Mikeitz"},
 #line 10 "strings_ashkenazi_poylish.gperf"
       {"Shabbat","Shabbos"},
-#line 49 "strings_ashkenazi_poylish.gperf"
+#line 50 "strings_ashkenazi_poylish.gperf"
       {"Parashat","Parshas"},
       {""},
-#line 70 "strings_ashkenazi_poylish.gperf"
+#line 71 "strings_ashkenazi_poylish.gperf"
       {"Lech-Lecha","Lech-Lecho"},
       {""},
-#line 58 "strings_ashkenazi_poylish.gperf"
+#line 59 "strings_ashkenazi_poylish.gperf"
       {"Bo","Boy"},
-#line 172 "strings_ashkenazi_poylish.gperf"
+#line 174 "strings_ashkenazi_poylish.gperf"
       {"Shushan Purim","Shushon Purim"},
       {""},
-#line 91 "strings_ashkenazi_poylish.gperf"
+#line 92 "strings_ashkenazi_poylish.gperf"
       {"Vaera","Voeiro"},
 #line 43 "strings_ashkenazi_poylish.gperf"
       {"Meilah","Meilu"},
 #line 41 "strings_ashkenazi_poylish.gperf"
       {"Temurah","Tmiru"},
-#line 166 "strings_ashkenazi_poylish.gperf"
+#line 168 "strings_ashkenazi_poylish.gperf"
       {"Shabbat Shuva","Shabbos Shuvo"},
       {""},
-#line 164 "strings_ashkenazi_poylish.gperf"
+#line 166 "strings_ashkenazi_poylish.gperf"
       {"Shabbat Rosh Chodesh","Shabbos Rosh Choydesh"},
-#line 186 "strings_ashkenazi_poylish.gperf"
+#line 188 "strings_ashkenazi_poylish.gperf"
       {"Tish'a B'Av","Tisho B'ov"},
-#line 73 "strings_ashkenazi_poylish.gperf"
+#line 74 "strings_ashkenazi_poylish.gperf"
       {"Metzora","Metzoyro"},
 #line 12 "strings_ashkenazi_poylish.gperf"
       {"Pesachim","Psuchim"},
       {""},
-#line 72 "strings_ashkenazi_poylish.gperf"
+#line 73 "strings_ashkenazi_poylish.gperf"
       {"Matot","Matos"},
       {""},
-#line 87 "strings_ashkenazi_poylish.gperf"
+#line 88 "strings_ashkenazi_poylish.gperf"
       {"Terumah","Trumo"},
 #line 36 "strings_ashkenazi_poylish.gperf"
       {"Zevachim","Zvuchim"},
-#line 167 "strings_ashkenazi_poylish.gperf"
+#line 169 "strings_ashkenazi_poylish.gperf"
       {"Shabbat Zachor","Shabbos Zochor"},
-#line 139 "strings_ashkenazi_poylish.gperf"
+#line 140 "strings_ashkenazi_poylish.gperf"
       {"Purim","Purim"},
       {""},
-#line 145 "strings_ashkenazi_poylish.gperf"
+#line 147 "strings_ashkenazi_poylish.gperf"
       {"Av","Ov"},
-#line 174 "strings_ashkenazi_poylish.gperf"
+#line 176 "strings_ashkenazi_poylish.gperf"
       {"Simchat Torah","Simchas Toyro"},
       {""},
-#line 162 "strings_ashkenazi_poylish.gperf"
-      {"Shabbat Nachamu","Shabbos Nachamu"},
-#line 89 "strings_ashkenazi_poylish.gperf"
+#line 63 "strings_ashkenazi_poylish.gperf"
+      {"Eikev","Aikev"},
+#line 90 "strings_ashkenazi_poylish.gperf"
       {"Toldot","Toldos"},
-#line 80 "strings_ashkenazi_poylish.gperf"
+#line 81 "strings_ashkenazi_poylish.gperf"
       {"Pinchas","Pinchos"},
 #line 9 "strings_ashkenazi_poylish.gperf"
       {"Berachot","Bruchos"},
-      {""}, {""},
-#line 69 "strings_ashkenazi_poylish.gperf"
+      {""},
+#line 164 "strings_ashkenazi_poylish.gperf"
+      {"Shabbat Nachamu","Shabbos Nachamu"},
+#line 70 "strings_ashkenazi_poylish.gperf"
       {"Korach","Koyrach"},
-#line 134 "strings_ashkenazi_poylish.gperf"
+#line 135 "strings_ashkenazi_poylish.gperf"
       {"Pesach Sheni","Peisach Sheini"},
       {""}, {""},
-#line 148 "strings_ashkenazi_poylish.gperf"
+#line 150 "strings_ashkenazi_poylish.gperf"
       {"Iyyar","Iyyor"},
       {""},
 #line 42 "strings_ashkenazi_poylish.gperf"
       {"Keritot","Krisos"},
-#line 163 "strings_ashkenazi_poylish.gperf"
+#line 165 "strings_ashkenazi_poylish.gperf"
       {"Shabbat Parah","Shabbos Poro"},
-#line 57 "strings_ashkenazi_poylish.gperf"
+#line 58 "strings_ashkenazi_poylish.gperf"
       {"Beshalach","Beshalach"},
 #line 45 "strings_ashkenazi_poylish.gperf"
       {"Tamid","Tumid"},
-#line 165 "strings_ashkenazi_poylish.gperf"
+#line 167 "strings_ashkenazi_poylish.gperf"
       {"Shabbat Shekalim","Shabbos Shkolim"},
-#line 66 "strings_ashkenazi_poylish.gperf"
+#line 67 "strings_ashkenazi_poylish.gperf"
       {"Ki Tavo","Ki-Sovo"},
 #line 39 "strings_ashkenazi_poylish.gperf"
       {"Bechorot","Bchoyros"},
       {""},
-#line 188 "strings_ashkenazi_poylish.gperf"
+#line 190 "strings_ashkenazi_poylish.gperf"
       {"Tu BiShvat","Tu BiShvat"},
-#line 96 "strings_ashkenazi_poylish.gperf"
+#line 97 "strings_ashkenazi_poylish.gperf"
       {"Vayera","Vayeiro"},
-#line 94 "strings_ashkenazi_poylish.gperf"
+#line 95 "strings_ashkenazi_poylish.gperf"
       {"Vayechi","Vayechi"},
-#line 56 "strings_ashkenazi_poylish.gperf"
+#line 57 "strings_ashkenazi_poylish.gperf"
       {"Bereshit","Braishis"},
       {""},
-#line 152 "strings_ashkenazi_poylish.gperf"
+#line 154 "strings_ashkenazi_poylish.gperf"
       {"Sivan","Sivon"},
 #line 11 "strings_ashkenazi_poylish.gperf"
       {"Eruvin","Airivin"},
       {""},
 #line 13 "strings_ashkenazi_poylish.gperf"
       {"Shekalim","Shkulim"},
-#line 142 "strings_ashkenazi_poylish.gperf"
+#line 144 "strings_ashkenazi_poylish.gperf"
       {"Adar","Odor"},
-#line 53 "strings_ashkenazi_poylish.gperf"
+#line 54 "strings_ashkenazi_poylish.gperf"
       {"Bechukotai","Bechikoysai"},
-#line 60 "strings_ashkenazi_poylish.gperf"
+#line 61 "strings_ashkenazi_poylish.gperf"
       {"Chukat","Chikas"},
-#line 85 "strings_ashkenazi_poylish.gperf"
+#line 86 "strings_ashkenazi_poylish.gperf"
       {"Shoftim","Shoftim"},
-#line 98 "strings_ashkenazi_poylish.gperf"
+#line 99 "strings_ashkenazi_poylish.gperf"
       {"Vayetzei","Vayeitzei"},
       {""},
 #line 30 "strings_ashkenazi_poylish.gperf"
@@ -309,125 +309,125 @@ hebcal_lookup_ashkenazi_poylish (registe
       {"Taanit","Taanis"},
 #line 40 "strings_ashkenazi_poylish.gperf"
       {"Arachin","Aruchin"},
-#line 88 "strings_ashkenazi_poylish.gperf"
+#line 89 "strings_ashkenazi_poylish.gperf"
       {"Tetzaveh","Tetzave"},
-#line 63 "strings_ashkenazi_poylish.gperf"
+#line 64 "strings_ashkenazi_poylish.gperf"
       {"Emor","Emoyr"},
       {""},
-#line 123 "strings_ashkenazi_poylish.gperf"
+#line 124 "strings_ashkenazi_poylish.gperf"
       {"Erev Tish'a B'Av","Erev Tisho Bov"},
 #line 22 "strings_ashkenazi_poylish.gperf"
       {"Ketubot","Ksibos"},
-#line 97 "strings_ashkenazi_poylish.gperf"
+#line 98 "strings_ashkenazi_poylish.gperf"
       {"Vayeshev","Vayeishev"},
-#line 75 "strings_ashkenazi_poylish.gperf"
+#line 76 "strings_ashkenazi_poylish.gperf"
       {"Mishpatim","Mishpotim"},
-#line 71 "strings_ashkenazi_poylish.gperf"
+#line 72 "strings_ashkenazi_poylish.gperf"
       {"Masei","Masei"},
-#line 151 "strings_ashkenazi_poylish.gperf"
+#line 153 "strings_ashkenazi_poylish.gperf"
       {"Sh'vat","Shvat"},
-#line 82 "strings_ashkenazi_poylish.gperf"
+#line 83 "strings_ashkenazi_poylish.gperf"
       {"Sh'lach","Shlach"},
       {""}, {""},
-#line 92 "strings_ashkenazi_poylish.gperf"
+#line 93 "strings_ashkenazi_poylish.gperf"
       {"Vaetchanan","Voeschanan"},
-#line 143 "strings_ashkenazi_poylish.gperf"
+#line 145 "strings_ashkenazi_poylish.gperf"
       {"Adar I","Odor Aleph"},
-#line 144 "strings_ashkenazi_poylish.gperf"
+#line 146 "strings_ashkenazi_poylish.gperf"
       {"Adar II","Odor Beis"},
 #line 37 "strings_ashkenazi_poylish.gperf"
       {"Menachot","Menuchos"},
       {""},
 #line 19 "strings_ashkenazi_poylish.gperf"
       {"Moed Katan","Moyed Koton"},
-#line 181 "strings_ashkenazi_poylish.gperf"
+#line 183 "strings_ashkenazi_poylish.gperf"
       {"Sukkot V (CH''M)","Sukkos V (CH''M)"},
-#line 119 "strings_ashkenazi_poylish.gperf"
+#line 120 "strings_ashkenazi_poylish.gperf"
       {"Erev Rosh Hashana","Erev Rosh-Hashono"},
       {""}, {""},
-#line 55 "strings_ashkenazi_poylish.gperf"
+#line 56 "strings_ashkenazi_poylish.gperf"
       {"Behar","Behar"},
-#line 135 "strings_ashkenazi_poylish.gperf"
+#line 136 "strings_ashkenazi_poylish.gperf"
       {"Pesach V (CH''M)","Peisach V (CH''M)"},
-#line 61 "strings_ashkenazi_poylish.gperf"
+#line 62 "strings_ashkenazi_poylish.gperf"
       {"Devarim","Dvurim"},
-#line 125 "strings_ashkenazi_poylish.gperf"
+#line 126 "strings_ashkenazi_poylish.gperf"
       {"Havdalah","Havdolo"},
       {""},
-#line 76 "strings_ashkenazi_poylish.gperf"
+#line 77 "strings_ashkenazi_poylish.gperf"
       {"Nasso","Nosso"},
       {""},
 #line 23 "strings_ashkenazi_poylish.gperf"
       {"Nedarim","Nedurim"},
-#line 190 "strings_ashkenazi_poylish.gperf"
+#line 192 "strings_ashkenazi_poylish.gperf"
       {"Tzom Gedaliah","Tzom Gdalyo"},
       {""},
-#line 103 "strings_ashkenazi_poylish.gperf"
+#line 104 "strings_ashkenazi_poylish.gperf"
       {"Yitro","Yisro"},
-#line 149 "strings_ashkenazi_poylish.gperf"
+#line 151 "strings_ashkenazi_poylish.gperf"
       {"Kislev","Kislev"},
-#line 159 "strings_ashkenazi_poylish.gperf"
+#line 161 "strings_ashkenazi_poylish.gperf"
       {"Shabbat HaChodesh","Shabbos HaChoydesh"},
-#line 52 "strings_ashkenazi_poylish.gperf"
+#line 53 "strings_ashkenazi_poylish.gperf"
       {"Bamidbar","Bamidbor"},
       {""},
-#line 101 "strings_ashkenazi_poylish.gperf"
+#line 102 "strings_ashkenazi_poylish.gperf"
       {"Vayishlach","Vayishlach"},
 #line 47 "strings_ashkenazi_poylish.gperf"
       {"Niddah","Niddu"},
 #line 38 "strings_ashkenazi_poylish.gperf"
       {"Chullin","Chillin"},
       {""}, {""},
-#line 118 "strings_ashkenazi_poylish.gperf"
+#line 119 "strings_ashkenazi_poylish.gperf"
       {"Erev Purim","Erev Purim"},
-#line 84 "strings_ashkenazi_poylish.gperf"
+#line 85 "strings_ashkenazi_poylish.gperf"
       {"Shmini","Shmini"},
 #line 35 "strings_ashkenazi_poylish.gperf"
       {"Horayot","Hoyroyos"},
-#line 65 "strings_ashkenazi_poylish.gperf"
+#line 66 "strings_ashkenazi_poylish.gperf"
       {"Kedoshim","Kdoyshim"},
       {""},
-#line 124 "strings_ashkenazi_poylish.gperf"
+#line 125 "strings_ashkenazi_poylish.gperf"
       {"Erev Yom Kippur","Erev Yom Kippur"},
       {""},
-#line 68 "strings_ashkenazi_poylish.gperf"
+#line 69 "strings_ashkenazi_poylish.gperf"
       {"Ki Tisa","Ki-Siso"},
       {""}, {""},
-#line 160 "strings_ashkenazi_poylish.gperf"
+#line 162 "strings_ashkenazi_poylish.gperf"
       {"Shabbat HaGadol","Shabbos HaGodol"},
-#line 117 "strings_ashkenazi_poylish.gperf"
+#line 118 "strings_ashkenazi_poylish.gperf"
       {"Erev Pesach","Erev Peisach"},
-#line 155 "strings_ashkenazi_poylish.gperf"
+#line 157 "strings_ashkenazi_poylish.gperf"
       {"Rosh Hashana","Rosh Hashono"},
-#line 121 "strings_ashkenazi_poylish.gperf"
+#line 122 "strings_ashkenazi_poylish.gperf"
       {"Erev Simchat Torah","Erev Simchas Toyro"},
-#line 156 "strings_ashkenazi_poylish.gperf"
+#line 158 "strings_ashkenazi_poylish.gperf"
       {"Rosh Hashana I","Rosh Hashono I"},
-#line 157 "strings_ashkenazi_poylish.gperf"
+#line 159 "strings_ashkenazi_poylish.gperf"
       {"Rosh Hashana II","Rosh Hashono II"},
-#line 122 "strings_ashkenazi_poylish.gperf"
+#line 123 "strings_ashkenazi_poylish.gperf"
       {"Erev Sukkot","Erev Sukkos"},
-#line 100 "strings_ashkenazi_poylish.gperf"
+#line 101 "strings_ashkenazi_poylish.gperf"
       {"Vayikra","Vayikro"},
       {""}, {""},
-#line 78 "strings_ashkenazi_poylish.gperf"
+#line 79 "strings_ashkenazi_poylish.gperf"
       {"Noach","Noyach"},
-#line 140 "strings_ashkenazi_poylish.gperf"
+#line 141 "strings_ashkenazi_poylish.gperf"
       {"Purim Katan","Purim Koton"},
-#line 180 "strings_ashkenazi_poylish.gperf"
+#line 182 "strings_ashkenazi_poylish.gperf"
       {"Sukkot IV (CH''M)","Sukkos IV (CH''M)"},
 #line 18 "strings_ashkenazi_poylish.gperf"
       {"Megillah","Megillu"},
 #line 14 "strings_ashkenazi_poylish.gperf"
       {"Yoma","Yimu"},
-#line 153 "strings_ashkenazi_poylish.gperf"
+#line 155 "strings_ashkenazi_poylish.gperf"
       {"Tamuz","Tamuz"},
-#line 102 "strings_ashkenazi_poylish.gperf"
+#line 103 "strings_ashkenazi_poylish.gperf"
       {"Vezot Haberakhah","Zoys Habrocho"},
-#line 133 "strings_ashkenazi_poylish.gperf"
+#line 134 "strings_ashkenazi_poylish.gperf"
       {"Pesach IV (CH''M)","Peisach IV (CH''M)"},
       {""}, {""},
-#line 81 "strings_ashkenazi_poylish.gperf"
+#line 82 "strings_ashkenazi_poylish.gperf"
       {"Re'eh","Reei"},
       {""},
 #line 16 "strings_ashkenazi_poylish.gperf"
@@ -435,140 +435,142 @@ hebcal_lookup_ashkenazi_poylish (registe
       {""},
 #line 27 "strings_ashkenazi_poylish.gperf"
       {"Kiddushin","Kiddishin"},
-#line 195 "strings_ashkenazi_poylish.gperf"
+#line 197 "strings_ashkenazi_poylish.gperf"
       {"Yom Kippur","Yom Kippur"},
-#line 86 "strings_ashkenazi_poylish.gperf"
+#line 87 "strings_ashkenazi_poylish.gperf"
       {"Tazria","Tazria"},
 #line 21 "strings_ashkenazi_poylish.gperf"
       {"Yevamot","Yevumos"},
       {""}, {""}, {""}, {""}, {""},
-#line 146 "strings_ashkenazi_poylish.gperf"
+#line 148 "strings_ashkenazi_poylish.gperf"
       {"Cheshvan","Cheshvon"},
-#line 95 "strings_ashkenazi_poylish.gperf"
+#line 96 "strings_ashkenazi_poylish.gperf"
       {"Vayeilech","Vayeilech"},
       {""}, {""}, {""},
-#line 106 "strings_ashkenazi_poylish.gperf"
+#line 107 "strings_ashkenazi_poylish.gperf"
       {"Chanukah","Chanukko"},
       {""},
-#line 51 "strings_ashkenazi_poylish.gperf"
+#line 52 "strings_ashkenazi_poylish.gperf"
       {"Balak","Bulok"},
       {""}, {""}, {""}, {""},
 #line 28 "strings_ashkenazi_poylish.gperf"
       {"Baba Kamma","Buvu Kamu"},
       {""},
-#line 115 "strings_ashkenazi_poylish.gperf"
+#line 116 "strings_ashkenazi_poylish.gperf"
       {"Chanukah: 8th Day","Chanukko: 8th Day"},
-#line 107 "strings_ashkenazi_poylish.gperf"
+#line 108 "strings_ashkenazi_poylish.gperf"
       {"Chanukah: 1 Candle","Chanukko: 1 Candle"},
-#line 114 "strings_ashkenazi_poylish.gperf"
+#line 115 "strings_ashkenazi_poylish.gperf"
       {"Chanukah: 8 Candles","Chanukko: 8 Candles"},
       {""}, {""},
-#line 161 "strings_ashkenazi_poylish.gperf"
+#line 163 "strings_ashkenazi_poylish.gperf"
       {"Shabbat Machar Chodesh","Shabbos Mochor Choydesh"},
-      {""},
-#line 158 "strings_ashkenazi_poylish.gperf"
+#line 49 "strings_ashkenazi_poylish.gperf"
+      {"Daf Yomi","Daf Yoymi"},
+#line 160 "strings_ashkenazi_poylish.gperf"
       {"Shabbat Chazon","Shabbos Chazon"},
-#line 126 "strings_ashkenazi_poylish.gperf"
+#line 127 "strings_ashkenazi_poylish.gperf"
       {"Lag BaOmer","Lag Boymer"},
       {""}, {""}, {""},
-#line 113 "strings_ashkenazi_poylish.gperf"
+#line 114 "strings_ashkenazi_poylish.gperf"
       {"Chanukah: 7 Candles","Chanukko: 7 Candles"},
 #line 48 "strings_ashkenazi_poylish.gperf"
       {"Daf Yomi: %s %d","Daf Yoymi: %s %d"},
 #line 44 "strings_ashkenazi_poylish.gperf"
       {"Kinnim","Kinnim"},
       {""},
-#line 77 "strings_ashkenazi_poylish.gperf"
+#line 78 "strings_ashkenazi_poylish.gperf"
       {"Nitzavim","Nitzovim"},
-#line 112 "strings_ashkenazi_poylish.gperf"
+#line 113 "strings_ashkenazi_poylish.gperf"
       {"Chanukah: 6 Candles","Chanukko: 6 Candles"},
 #line 26 "strings_ashkenazi_poylish.gperf"
       {"Gitin","Gitin"},
-#line 59 "strings_ashkenazi_poylish.gperf"
+#line 60 "strings_ashkenazi_poylish.gperf"
       {"Chayei Sara","Chayei Suru"},
-#line 120 "strings_ashkenazi_poylish.gperf"
-      {"Erev Shavuot","Erev Shvuos"},
+#line 143 "strings_ashkenazi_poylish.gperf"
+      {"Rosh Chodesh","Rosh Choydesh"},
       {""},
-#line 111 "strings_ashkenazi_poylish.gperf"
+#line 112 "strings_ashkenazi_poylish.gperf"
       {"Chanukah: 5 Candles","Chanukko: 5 Candles"},
-#line 141 "strings_ashkenazi_poylish.gperf"
+#line 142 "strings_ashkenazi_poylish.gperf"
       {"Rosh Chodesh %s","Rosh Choydesh %s"},
       {""}, {""},
-#line 104 "strings_ashkenazi_poylish.gperf"
+#line 105 "strings_ashkenazi_poylish.gperf"
       {"Asara B'Tevet","Asoro Beteyves"},
 #line 31 "strings_ashkenazi_poylish.gperf"
       {"Sanhedrin","Sanhedrin"},
-#line 150 "strings_ashkenazi_poylish.gperf"
+#line 152 "strings_ashkenazi_poylish.gperf"
       {"Nisan","Nison"},
       {""},
 #line 34 "strings_ashkenazi_poylish.gperf"
       {"Avodah Zarah","Avoydu Zuru"},
       {""},
-#line 185 "strings_ashkenazi_poylish.gperf"
+#line 187 "strings_ashkenazi_poylish.gperf"
       {"Ta'anit Esther","Taanis Ester"},
       {""}, {""}, {""},
-#line 93 "strings_ashkenazi_poylish.gperf"
+#line 94 "strings_ashkenazi_poylish.gperf"
       {"Vayakhel","Vayakhel"},
-#line 110 "strings_ashkenazi_poylish.gperf"
+#line 111 "strings_ashkenazi_poylish.gperf"
       {"Chanukah: 4 Candles","Chanukko: 4 Candles"},
 #line 24 "strings_ashkenazi_poylish.gperf"
       {"Nazir","Nuzir"},
       {""}, {""}, {""},
-#line 109 "strings_ashkenazi_poylish.gperf"
+#line 110 "strings_ashkenazi_poylish.gperf"
       {"Chanukah: 3 Candles","Chanukko: 3 Candles"},
       {""},
-#line 196 "strings_ashkenazi_poylish.gperf"
+#line 198 "strings_ashkenazi_poylish.gperf"
       {"Yom Yerushalayim","Yom Yerusholayim"},
       {""},
-#line 99 "strings_ashkenazi_poylish.gperf"
+#line 100 "strings_ashkenazi_poylish.gperf"
       {"Vayigash","Vayigash"},
-#line 108 "strings_ashkenazi_poylish.gperf"
+#line 109 "strings_ashkenazi_poylish.gperf"
       {"Chanukah: 2 Candles","Chanukko: 2 Candles"},
       {""}, {""}, {""}, {""}, {""},
-#line 50 "strings_ashkenazi_poylish.gperf"
+#line 51 "strings_ashkenazi_poylish.gperf"
       {"Achrei Mot","Achrai"},
 #line 29 "strings_ashkenazi_poylish.gperf"
       {"Baba Metzia","Buvu Metziu"},
-      {""},
-#line 194 "strings_ashkenazi_poylish.gperf"
+#line 121 "strings_ashkenazi_poylish.gperf"
+      {"Erev Shavuot","Erev Shvuos"},
+#line 196 "strings_ashkenazi_poylish.gperf"
       {"Yom HaZikaron","Yom HaZikaron"},
       {""}, {""}, {""}, {""},
-#line 127 "strings_ashkenazi_poylish.gperf"
+#line 128 "strings_ashkenazi_poylish.gperf"
       {"Leil Selichot","Slichos"},
       {""}, {""}, {""}, {""}, {""},
-#line 171 "strings_ashkenazi_poylish.gperf"
+#line 173 "strings_ashkenazi_poylish.gperf"
       {"Shmini Atzeret","Shmini Atzeres"},
       {""}, {""}, {""},
 #line 20 "strings_ashkenazi_poylish.gperf"
       {"Chagigah","Chagigu"},
       {""}, {""}, {""}, {""},
-#line 64 "strings_ashkenazi_poylish.gperf"
+#line 65 "strings_ashkenazi_poylish.gperf"
       {"Ha'Azinu","Haazini"},
       {""}, {""},
-#line 116 "strings_ashkenazi_poylish.gperf"
+#line 117 "strings_ashkenazi_poylish.gperf"
       {"Days of the Omer","Oymer"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 67 "strings_ashkenazi_poylish.gperf"
+#line 68 "strings_ashkenazi_poylish.gperf"
       {"Ki Teitzei","Ki-Seitzei"},
-#line 184 "strings_ashkenazi_poylish.gperf"
+#line 186 "strings_ashkenazi_poylish.gperf"
       {"Ta'anit Bechorot","Taanis Bchoros"},
-#line 54 "strings_ashkenazi_poylish.gperf"
+#line 55 "strings_ashkenazi_poylish.gperf"
       {"Beha'alotcha","Bahaaloschu"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 193 "strings_ashkenazi_poylish.gperf"
+#line 195 "strings_ashkenazi_poylish.gperf"
       {"Yom HaShoah","Yom HaShoah"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 191 "strings_ashkenazi_poylish.gperf"
+#line 193 "strings_ashkenazi_poylish.gperf"
       {"Tzom Tammuz","Tzom Tammuz"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 192 "strings_ashkenazi_poylish.gperf"
+#line 194 "strings_ashkenazi_poylish.gperf"
       {"Yom HaAtzma'ut","Yom HaAtzma'ut"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 197 "strings_ashkenazi_poylish.gperf"
+#line 199 "strings_ashkenazi_poylish.gperf"
       {"Yom HaAliyah","Yom HaAliyah"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -580,7 +582,7 @@ hebcal_lookup_ashkenazi_poylish (registe
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""},
-#line 105 "strings_ashkenazi_poylish.gperf"
+#line 106 "strings_ashkenazi_poylish.gperf"
       {"Candle lighting","Hadlokas neyros"}
     };
 
--- hebcal-4.20.orig/strings_ashkenazi_standard.c
+++ hebcal-4.20/strings_ashkenazi_standard.c
@@ -35,7 +35,7 @@
 #line 7 "strings_ashkenazi_standard.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 189
+#define TOTAL_KEYWORDS 191
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 25
 #define MIN_HASH_VALUE 4
@@ -61,11 +61,11 @@ hash (register const char *str, register
         0, 461, 461, 461, 461, 461,   5, 461, 461,   0,
        45,  40,  35,  20,  15,  10,   0, 461, 461,   0,
       461, 461, 461, 461, 461,  75,  55,  90, 135,  15,
-        5, 110,  45,   0,   0,  80,   5,  40, 140,   5,
+        5, 110,  45,   0,   0,  80,   5,  40, 140,  10,
         5,  35,  70,   0,   0,   5,  10, 165, 461, 125,
        10,   0, 461, 461, 461, 461, 461,  30,  10,  15,
         0,  35,  65,   0,  80,   5,  80,   0,  75,  55,
-       65, 100,   0,   5,   0,   0,  20,   5,   0,  25,
+       65, 100,   0,   5,   0,   0,  20,   5,   0,  60,
       461,  85, 110, 125, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
@@ -118,189 +118,189 @@ hebcal_lookup_ashkenazi_standard (regist
   static struct event_title wordlist[] =
     {
       {""}, {""}, {""}, {""},
-#line 173 "strings_ashkenazi_standard.gperf"
+#line 175 "strings_ashkenazi_standard.gperf"
       {"Sigd","Sigd"},
       {""},
-#line 175 "strings_ashkenazi_standard.gperf"
+#line 177 "strings_ashkenazi_standard.gperf"
       {"Sukkot","Sukkos"},
-#line 187 "strings_ashkenazi_standard.gperf"
+#line 189 "strings_ashkenazi_standard.gperf"
       {"Tu B'Av","Tu B'ov"},
-#line 176 "strings_ashkenazi_standard.gperf"
+#line 178 "strings_ashkenazi_standard.gperf"
       {"Sukkot I","Sukkos I"},
-#line 177 "strings_ashkenazi_standard.gperf"
+#line 179 "strings_ashkenazi_standard.gperf"
       {"Sukkot II","Sukkos II"},
-#line 154 "strings_ashkenazi_standard.gperf"
+#line 156 "strings_ashkenazi_standard.gperf"
       {"Tevet","Teyves"},
-#line 128 "strings_ashkenazi_standard.gperf"
+#line 129 "strings_ashkenazi_standard.gperf"
       {"Pesach","Peisach"},
       {""},
-#line 129 "strings_ashkenazi_standard.gperf"
-      {"Pesach I","Peisach I"},
 #line 130 "strings_ashkenazi_standard.gperf"
+      {"Pesach I","Peisach I"},
+#line 131 "strings_ashkenazi_standard.gperf"
       {"Pesach II","Peisach II"},
       {""},
 #line 15 "strings_ashkenazi_standard.gperf"
       {"Sukkah","Sukko"},
-#line 178 "strings_ashkenazi_standard.gperf"
+#line 180 "strings_ashkenazi_standard.gperf"
       {"Sukkot II (CH''M)","Sukkos II (CH''M)"},
-#line 179 "strings_ashkenazi_standard.gperf"
+#line 181 "strings_ashkenazi_standard.gperf"
       {"Sukkot III (CH''M)","Sukkos III (CH''M)"},
       {""},
-#line 189 "strings_ashkenazi_standard.gperf"
+#line 191 "strings_ashkenazi_standard.gperf"
       {"Tu B'Shvat","Tu BiShvat"},
       {""},
-#line 131 "strings_ashkenazi_standard.gperf"
-      {"Pesach II (CH''M)","Peisach II (CH''M)"},
 #line 132 "strings_ashkenazi_standard.gperf"
+      {"Pesach II (CH''M)","Peisach II (CH''M)"},
+#line 133 "strings_ashkenazi_standard.gperf"
       {"Pesach III (CH''M)","Peisach III (CH''M)"},
-#line 147 "strings_ashkenazi_standard.gperf"
+#line 149 "strings_ashkenazi_standard.gperf"
       {"Elul","Elul"},
-#line 137 "strings_ashkenazi_standard.gperf"
-      {"Pesach VII","Peisach VII"},
 #line 138 "strings_ashkenazi_standard.gperf"
+      {"Pesach VII","Peisach VII"},
+#line 139 "strings_ashkenazi_standard.gperf"
       {"Pesach VIII","Peisach VIII"},
-#line 182 "strings_ashkenazi_standard.gperf"
+#line 184 "strings_ashkenazi_standard.gperf"
       {"Sukkot VI (CH''M)","Sukkos VI (CH''M)"},
       {""}, {""},
 #line 25 "strings_ashkenazi_standard.gperf"
       {"Sotah","Soyto"},
       {""},
-#line 136 "strings_ashkenazi_standard.gperf"
+#line 137 "strings_ashkenazi_standard.gperf"
       {"Pesach VI (CH''M)","Peisach VI (CH''M)"},
       {""},
-#line 90 "strings_ashkenazi_standard.gperf"
+#line 91 "strings_ashkenazi_standard.gperf"
       {"Tzav","Tzav"},
-#line 183 "strings_ashkenazi_standard.gperf"
+#line 185 "strings_ashkenazi_standard.gperf"
       {"Sukkot VII (Hoshana Raba)","Sukkos VII (Hoyshano Rabo)"},
       {""},
-#line 168 "strings_ashkenazi_standard.gperf"
+#line 170 "strings_ashkenazi_standard.gperf"
       {"Shavuot","Shvuos"},
       {""},
-#line 169 "strings_ashkenazi_standard.gperf"
+#line 171 "strings_ashkenazi_standard.gperf"
       {"Shavuot I","Shvuos I"},
-#line 170 "strings_ashkenazi_standard.gperf"
+#line 172 "strings_ashkenazi_standard.gperf"
       {"Shavuot II","Shvuos II"},
-#line 83 "strings_ashkenazi_standard.gperf"
+#line 84 "strings_ashkenazi_standard.gperf"
       {"Shemot","Shmoys"},
 #line 33 "strings_ashkenazi_standard.gperf"
       {"Shevuot","Shvuos"},
-      {""}, {""},
-#line 62 "strings_ashkenazi_standard.gperf"
-      {"Eikev","Eikev"},
+      {""}, {""}, {""},
 #line 32 "strings_ashkenazi_standard.gperf"
       {"Makkot","Makkos"},
-#line 79 "strings_ashkenazi_standard.gperf"
+#line 80 "strings_ashkenazi_standard.gperf"
       {"Pekudei","Pkudey"},
       {""}, {""},
 #line 46 "strings_ashkenazi_standard.gperf"
       {"Midot","Midos"},
-#line 74 "strings_ashkenazi_standard.gperf"
+#line 75 "strings_ashkenazi_standard.gperf"
       {"Miketz","Mikeitz"},
 #line 10 "strings_ashkenazi_standard.gperf"
       {"Shabbat","Shabbos"},
-#line 49 "strings_ashkenazi_standard.gperf"
+#line 50 "strings_ashkenazi_standard.gperf"
       {"Parashat","Parshas"},
       {""},
-#line 70 "strings_ashkenazi_standard.gperf"
+#line 71 "strings_ashkenazi_standard.gperf"
       {"Lech-Lecha","Lech-Lecho"},
       {""},
-#line 58 "strings_ashkenazi_standard.gperf"
+#line 59 "strings_ashkenazi_standard.gperf"
       {"Bo","Boy"},
-#line 172 "strings_ashkenazi_standard.gperf"
+#line 174 "strings_ashkenazi_standard.gperf"
       {"Shushan Purim","Shushon Purim"},
       {""},
-#line 91 "strings_ashkenazi_standard.gperf"
+#line 92 "strings_ashkenazi_standard.gperf"
       {"Vaera","Voeiro"},
 #line 43 "strings_ashkenazi_standard.gperf"
       {"Meilah","Meilo"},
 #line 41 "strings_ashkenazi_standard.gperf"
       {"Temurah","Tmuro"},
-#line 166 "strings_ashkenazi_standard.gperf"
+#line 168 "strings_ashkenazi_standard.gperf"
       {"Shabbat Shuva","Shabbos Shuvo"},
       {""},
-#line 164 "strings_ashkenazi_standard.gperf"
+#line 166 "strings_ashkenazi_standard.gperf"
       {"Shabbat Rosh Chodesh","Shabbos Rosh Choydesh"},
-#line 186 "strings_ashkenazi_standard.gperf"
+#line 188 "strings_ashkenazi_standard.gperf"
       {"Tish'a B'Av","Tisho B'ov"},
-#line 73 "strings_ashkenazi_standard.gperf"
+#line 74 "strings_ashkenazi_standard.gperf"
       {"Metzora","Metzoyro"},
 #line 12 "strings_ashkenazi_standard.gperf"
       {"Pesachim","Psochim"},
       {""},
-#line 72 "strings_ashkenazi_standard.gperf"
+#line 73 "strings_ashkenazi_standard.gperf"
       {"Matot","Matos"},
       {""},
-#line 87 "strings_ashkenazi_standard.gperf"
+#line 88 "strings_ashkenazi_standard.gperf"
       {"Terumah","Trumo"},
 #line 36 "strings_ashkenazi_standard.gperf"
       {"Zevachim","Zvochim"},
-#line 167 "strings_ashkenazi_standard.gperf"
+#line 169 "strings_ashkenazi_standard.gperf"
       {"Shabbat Zachor","Shabbos Zochor"},
-#line 139 "strings_ashkenazi_standard.gperf"
+#line 140 "strings_ashkenazi_standard.gperf"
       {"Purim","Purim"},
       {""},
-#line 145 "strings_ashkenazi_standard.gperf"
+#line 147 "strings_ashkenazi_standard.gperf"
       {"Av","Ov"},
-#line 174 "strings_ashkenazi_standard.gperf"
+#line 176 "strings_ashkenazi_standard.gperf"
       {"Simchat Torah","Simchas Toyro"},
       {""},
-#line 162 "strings_ashkenazi_standard.gperf"
-      {"Shabbat Nachamu","Shabbos Nachamu"},
-#line 89 "strings_ashkenazi_standard.gperf"
+#line 63 "strings_ashkenazi_standard.gperf"
+      {"Eikev","Eikev"},
+#line 90 "strings_ashkenazi_standard.gperf"
       {"Toldot","Toldos"},
-#line 80 "strings_ashkenazi_standard.gperf"
+#line 81 "strings_ashkenazi_standard.gperf"
       {"Pinchas","Pinchos"},
 #line 9 "strings_ashkenazi_standard.gperf"
       {"Berachot","Brochos"},
-      {""}, {""},
-#line 69 "strings_ashkenazi_standard.gperf"
+      {""},
+#line 164 "strings_ashkenazi_standard.gperf"
+      {"Shabbat Nachamu","Shabbos Nachamu"},
+#line 70 "strings_ashkenazi_standard.gperf"
       {"Korach","Koyrach"},
-#line 134 "strings_ashkenazi_standard.gperf"
+#line 135 "strings_ashkenazi_standard.gperf"
       {"Pesach Sheni","Peisach Sheini"},
       {""}, {""},
-#line 148 "strings_ashkenazi_standard.gperf"
+#line 150 "strings_ashkenazi_standard.gperf"
       {"Iyyar","Iyyor"},
       {""},
 #line 42 "strings_ashkenazi_standard.gperf"
       {"Keritot","Krisos"},
-#line 163 "strings_ashkenazi_standard.gperf"
+#line 165 "strings_ashkenazi_standard.gperf"
       {"Shabbat Parah","Shabbos Poro"},
-#line 57 "strings_ashkenazi_standard.gperf"
+#line 58 "strings_ashkenazi_standard.gperf"
       {"Beshalach","Beshalach"},
 #line 45 "strings_ashkenazi_standard.gperf"
       {"Tamid","Tomid"},
-#line 165 "strings_ashkenazi_standard.gperf"
+#line 167 "strings_ashkenazi_standard.gperf"
       {"Shabbat Shekalim","Shabbos Shkolim"},
-#line 66 "strings_ashkenazi_standard.gperf"
+#line 67 "strings_ashkenazi_standard.gperf"
       {"Ki Tavo","Ki-Sovo"},
 #line 39 "strings_ashkenazi_standard.gperf"
       {"Bechorot","Bchoyros"},
       {""},
-#line 188 "strings_ashkenazi_standard.gperf"
+#line 190 "strings_ashkenazi_standard.gperf"
       {"Tu BiShvat","Tu BiShvat"},
-#line 96 "strings_ashkenazi_standard.gperf"
+#line 97 "strings_ashkenazi_standard.gperf"
       {"Vayera","Vayeiro"},
-#line 94 "strings_ashkenazi_standard.gperf"
+#line 95 "strings_ashkenazi_standard.gperf"
       {"Vayechi","Vayechi"},
-#line 56 "strings_ashkenazi_standard.gperf"
+#line 57 "strings_ashkenazi_standard.gperf"
       {"Bereshit","Breishis"},
       {""},
-#line 152 "strings_ashkenazi_standard.gperf"
+#line 154 "strings_ashkenazi_standard.gperf"
       {"Sivan","Sivon"},
 #line 11 "strings_ashkenazi_standard.gperf"
       {"Eruvin","Eiruvin"},
       {""},
 #line 13 "strings_ashkenazi_standard.gperf"
       {"Shekalim","Shkolim"},
-#line 142 "strings_ashkenazi_standard.gperf"
+#line 144 "strings_ashkenazi_standard.gperf"
       {"Adar","Odor"},
-#line 53 "strings_ashkenazi_standard.gperf"
+#line 54 "strings_ashkenazi_standard.gperf"
       {"Bechukotai","Bechukoysai"},
-#line 60 "strings_ashkenazi_standard.gperf"
+#line 61 "strings_ashkenazi_standard.gperf"
       {"Chukat","Chukas"},
-#line 85 "strings_ashkenazi_standard.gperf"
+#line 86 "strings_ashkenazi_standard.gperf"
       {"Shoftim","Shoftim"},
-#line 98 "strings_ashkenazi_standard.gperf"
+#line 99 "strings_ashkenazi_standard.gperf"
       {"Vayetzei","Vayeitzei"},
       {""},
 #line 30 "strings_ashkenazi_standard.gperf"
@@ -309,125 +309,125 @@ hebcal_lookup_ashkenazi_standard (regist
       {"Taanit","Taanis"},
 #line 40 "strings_ashkenazi_standard.gperf"
       {"Arachin","Arochin"},
-#line 88 "strings_ashkenazi_standard.gperf"
+#line 89 "strings_ashkenazi_standard.gperf"
       {"Tetzaveh","Tetzave"},
-#line 63 "strings_ashkenazi_standard.gperf"
+#line 64 "strings_ashkenazi_standard.gperf"
       {"Emor","Emor"},
       {""},
-#line 123 "strings_ashkenazi_standard.gperf"
+#line 124 "strings_ashkenazi_standard.gperf"
       {"Erev Tish'a B'Av","Erev Tisho Bov"},
 #line 22 "strings_ashkenazi_standard.gperf"
       {"Ketubot","Ksubos"},
-#line 97 "strings_ashkenazi_standard.gperf"
+#line 98 "strings_ashkenazi_standard.gperf"
       {"Vayeshev","Vayeishev"},
-#line 75 "strings_ashkenazi_standard.gperf"
+#line 76 "strings_ashkenazi_standard.gperf"
       {"Mishpatim","Mishpotim"},
-#line 71 "strings_ashkenazi_standard.gperf"
+#line 72 "strings_ashkenazi_standard.gperf"
       {"Masei","Masei"},
-#line 151 "strings_ashkenazi_standard.gperf"
+#line 153 "strings_ashkenazi_standard.gperf"
       {"Sh'vat","Shvat"},
-#line 82 "strings_ashkenazi_standard.gperf"
+#line 83 "strings_ashkenazi_standard.gperf"
       {"Sh'lach","Shlach"},
       {""}, {""},
-#line 92 "strings_ashkenazi_standard.gperf"
+#line 93 "strings_ashkenazi_standard.gperf"
       {"Vaetchanan","Voeschanan"},
-#line 143 "strings_ashkenazi_standard.gperf"
+#line 145 "strings_ashkenazi_standard.gperf"
       {"Adar I","Odor Aleph"},
-#line 144 "strings_ashkenazi_standard.gperf"
+#line 146 "strings_ashkenazi_standard.gperf"
       {"Adar II","Odor Beis"},
 #line 37 "strings_ashkenazi_standard.gperf"
       {"Menachot","Menochos"},
       {""},
 #line 19 "strings_ashkenazi_standard.gperf"
       {"Moed Katan","Moyed Koton"},
-#line 181 "strings_ashkenazi_standard.gperf"
+#line 183 "strings_ashkenazi_standard.gperf"
       {"Sukkot V (CH''M)","Sukkos V (CH''M)"},
-#line 119 "strings_ashkenazi_standard.gperf"
+#line 120 "strings_ashkenazi_standard.gperf"
       {"Erev Rosh Hashana","Erev Rosh-Hashono"},
       {""}, {""},
-#line 55 "strings_ashkenazi_standard.gperf"
+#line 56 "strings_ashkenazi_standard.gperf"
       {"Behar","Behar"},
-#line 135 "strings_ashkenazi_standard.gperf"
+#line 136 "strings_ashkenazi_standard.gperf"
       {"Pesach V (CH''M)","Peisach V (CH''M)"},
-#line 61 "strings_ashkenazi_standard.gperf"
+#line 62 "strings_ashkenazi_standard.gperf"
       {"Devarim","Dvorim"},
-#line 125 "strings_ashkenazi_standard.gperf"
+#line 126 "strings_ashkenazi_standard.gperf"
       {"Havdalah","Havdolo"},
       {""},
-#line 76 "strings_ashkenazi_standard.gperf"
+#line 77 "strings_ashkenazi_standard.gperf"
       {"Nasso","Nosso"},
       {""},
 #line 23 "strings_ashkenazi_standard.gperf"
       {"Nedarim","Nedorim"},
-#line 190 "strings_ashkenazi_standard.gperf"
+#line 192 "strings_ashkenazi_standard.gperf"
       {"Tzom Gedaliah","Tzom Gdalyo"},
       {""},
-#line 103 "strings_ashkenazi_standard.gperf"
+#line 104 "strings_ashkenazi_standard.gperf"
       {"Yitro","Yisro"},
-#line 149 "strings_ashkenazi_standard.gperf"
+#line 151 "strings_ashkenazi_standard.gperf"
       {"Kislev","Kislev"},
-#line 159 "strings_ashkenazi_standard.gperf"
+#line 161 "strings_ashkenazi_standard.gperf"
       {"Shabbat HaChodesh","Shabbos HaChoydesh"},
-#line 52 "strings_ashkenazi_standard.gperf"
+#line 53 "strings_ashkenazi_standard.gperf"
       {"Bamidbar","Bamidbor"},
       {""},
-#line 101 "strings_ashkenazi_standard.gperf"
+#line 102 "strings_ashkenazi_standard.gperf"
       {"Vayishlach","Vayishlach"},
 #line 47 "strings_ashkenazi_standard.gperf"
       {"Niddah","Niddo"},
 #line 38 "strings_ashkenazi_standard.gperf"
       {"Chullin","Chullin"},
       {""}, {""},
-#line 118 "strings_ashkenazi_standard.gperf"
+#line 119 "strings_ashkenazi_standard.gperf"
       {"Erev Purim","Erev Purim"},
-#line 84 "strings_ashkenazi_standard.gperf"
+#line 85 "strings_ashkenazi_standard.gperf"
       {"Shmini","Shmini"},
 #line 35 "strings_ashkenazi_standard.gperf"
       {"Horayot","Hoyroyos"},
-#line 65 "strings_ashkenazi_standard.gperf"
+#line 66 "strings_ashkenazi_standard.gperf"
       {"Kedoshim","Kdoyshim"},
       {""},
-#line 124 "strings_ashkenazi_standard.gperf"
+#line 125 "strings_ashkenazi_standard.gperf"
       {"Erev Yom Kippur","Erev Yom Kippur"},
       {""},
-#line 68 "strings_ashkenazi_standard.gperf"
+#line 69 "strings_ashkenazi_standard.gperf"
       {"Ki Tisa","Ki-Siso"},
       {""}, {""},
-#line 160 "strings_ashkenazi_standard.gperf"
+#line 162 "strings_ashkenazi_standard.gperf"
       {"Shabbat HaGadol","Shabbos HaGodol"},
-#line 117 "strings_ashkenazi_standard.gperf"
+#line 118 "strings_ashkenazi_standard.gperf"
       {"Erev Pesach","Erev Peisach"},
-#line 155 "strings_ashkenazi_standard.gperf"
+#line 157 "strings_ashkenazi_standard.gperf"
       {"Rosh Hashana","Rosh Hashono"},
-#line 121 "strings_ashkenazi_standard.gperf"
+#line 122 "strings_ashkenazi_standard.gperf"
       {"Erev Simchat Torah","Erev Simchas Toyro"},
-#line 156 "strings_ashkenazi_standard.gperf"
+#line 158 "strings_ashkenazi_standard.gperf"
       {"Rosh Hashana I","Rosh Hashono I"},
-#line 157 "strings_ashkenazi_standard.gperf"
+#line 159 "strings_ashkenazi_standard.gperf"
       {"Rosh Hashana II","Rosh Hashono II"},
-#line 122 "strings_ashkenazi_standard.gperf"
+#line 123 "strings_ashkenazi_standard.gperf"
       {"Erev Sukkot","Erev Sukkos"},
-#line 100 "strings_ashkenazi_standard.gperf"
+#line 101 "strings_ashkenazi_standard.gperf"
       {"Vayikra","Vayikro"},
       {""}, {""},
-#line 78 "strings_ashkenazi_standard.gperf"
+#line 79 "strings_ashkenazi_standard.gperf"
       {"Noach","Noyach"},
-#line 140 "strings_ashkenazi_standard.gperf"
+#line 141 "strings_ashkenazi_standard.gperf"
       {"Purim Katan","Purim Koton"},
-#line 180 "strings_ashkenazi_standard.gperf"
+#line 182 "strings_ashkenazi_standard.gperf"
       {"Sukkot IV (CH''M)","Sukkos IV (CH''M)"},
 #line 18 "strings_ashkenazi_standard.gperf"
       {"Megillah","Megillo"},
 #line 14 "strings_ashkenazi_standard.gperf"
       {"Yoma","Yumo"},
-#line 153 "strings_ashkenazi_standard.gperf"
+#line 155 "strings_ashkenazi_standard.gperf"
       {"Tamuz","Tamuz"},
-#line 102 "strings_ashkenazi_standard.gperf"
+#line 103 "strings_ashkenazi_standard.gperf"
       {"Vezot Haberakhah","Zoys Habrocho"},
-#line 133 "strings_ashkenazi_standard.gperf"
+#line 134 "strings_ashkenazi_standard.gperf"
       {"Pesach IV (CH''M)","Peisach IV (CH''M)"},
       {""}, {""},
-#line 81 "strings_ashkenazi_standard.gperf"
+#line 82 "strings_ashkenazi_standard.gperf"
       {"Re'eh","Reei"},
       {""},
 #line 16 "strings_ashkenazi_standard.gperf"
@@ -435,140 +435,142 @@ hebcal_lookup_ashkenazi_standard (regist
       {""},
 #line 27 "strings_ashkenazi_standard.gperf"
       {"Kiddushin","Kiddushin"},
-#line 195 "strings_ashkenazi_standard.gperf"
+#line 197 "strings_ashkenazi_standard.gperf"
       {"Yom Kippur","Yom Kippur"},
-#line 86 "strings_ashkenazi_standard.gperf"
+#line 87 "strings_ashkenazi_standard.gperf"
       {"Tazria","Tazria"},
 #line 21 "strings_ashkenazi_standard.gperf"
       {"Yevamot","Yevomos"},
       {""}, {""}, {""}, {""}, {""},
-#line 146 "strings_ashkenazi_standard.gperf"
+#line 148 "strings_ashkenazi_standard.gperf"
       {"Cheshvan","Cheshvon"},
-#line 95 "strings_ashkenazi_standard.gperf"
+#line 96 "strings_ashkenazi_standard.gperf"
       {"Vayeilech","Vayeilech"},
       {""}, {""}, {""},
-#line 106 "strings_ashkenazi_standard.gperf"
+#line 107 "strings_ashkenazi_standard.gperf"
       {"Chanukah","Chanukko"},
       {""},
-#line 51 "strings_ashkenazi_standard.gperf"
+#line 52 "strings_ashkenazi_standard.gperf"
       {"Balak","Bolok"},
       {""}, {""}, {""}, {""},
 #line 28 "strings_ashkenazi_standard.gperf"
       {"Baba Kamma","Bovo Kamo"},
       {""},
-#line 115 "strings_ashkenazi_standard.gperf"
+#line 116 "strings_ashkenazi_standard.gperf"
       {"Chanukah: 8th Day","Chanukko: 8th Day"},
-#line 107 "strings_ashkenazi_standard.gperf"
+#line 108 "strings_ashkenazi_standard.gperf"
       {"Chanukah: 1 Candle","Chanukko: 1 Candle"},
-#line 114 "strings_ashkenazi_standard.gperf"
+#line 115 "strings_ashkenazi_standard.gperf"
       {"Chanukah: 8 Candles","Chanukko: 8 Candles"},
       {""}, {""},
-#line 161 "strings_ashkenazi_standard.gperf"
+#line 163 "strings_ashkenazi_standard.gperf"
       {"Shabbat Machar Chodesh","Shabbos Mochor Choydesh"},
-      {""},
-#line 158 "strings_ashkenazi_standard.gperf"
+#line 49 "strings_ashkenazi_standard.gperf"
+      {"Daf Yomi","Daf Yoymi"},
+#line 160 "strings_ashkenazi_standard.gperf"
       {"Shabbat Chazon","Shabbos Chazon"},
-#line 126 "strings_ashkenazi_standard.gperf"
+#line 127 "strings_ashkenazi_standard.gperf"
       {"Lag BaOmer","Lag Boymer"},
       {""}, {""}, {""},
-#line 113 "strings_ashkenazi_standard.gperf"
+#line 114 "strings_ashkenazi_standard.gperf"
       {"Chanukah: 7 Candles","Chanukko: 7 Candles"},
 #line 48 "strings_ashkenazi_standard.gperf"
       {"Daf Yomi: %s %d","Daf Yoymi: %s %d"},
 #line 44 "strings_ashkenazi_standard.gperf"
       {"Kinnim","Kinnim"},
       {""},
-#line 77 "strings_ashkenazi_standard.gperf"
+#line 78 "strings_ashkenazi_standard.gperf"
       {"Nitzavim","Nitzovim"},
-#line 112 "strings_ashkenazi_standard.gperf"
+#line 113 "strings_ashkenazi_standard.gperf"
       {"Chanukah: 6 Candles","Chanukko: 6 Candles"},
 #line 26 "strings_ashkenazi_standard.gperf"
       {"Gitin","Gitin"},
-#line 59 "strings_ashkenazi_standard.gperf"
+#line 60 "strings_ashkenazi_standard.gperf"
       {"Chayei Sara","Chayei Soro"},
-#line 120 "strings_ashkenazi_standard.gperf"
-      {"Erev Shavuot","Erev Shvuos"},
+#line 143 "strings_ashkenazi_standard.gperf"
+      {"Rosh Chodesh","Rosh Choydesh"},
       {""},
-#line 111 "strings_ashkenazi_standard.gperf"
+#line 112 "strings_ashkenazi_standard.gperf"
       {"Chanukah: 5 Candles","Chanukko: 5 Candles"},
-#line 141 "strings_ashkenazi_standard.gperf"
+#line 142 "strings_ashkenazi_standard.gperf"
       {"Rosh Chodesh %s","Rosh Choydesh %s"},
       {""}, {""},
-#line 104 "strings_ashkenazi_standard.gperf"
+#line 105 "strings_ashkenazi_standard.gperf"
       {"Asara B'Tevet","Asoro Beteyves"},
 #line 31 "strings_ashkenazi_standard.gperf"
       {"Sanhedrin","Sanhedrin"},
-#line 150 "strings_ashkenazi_standard.gperf"
+#line 152 "strings_ashkenazi_standard.gperf"
       {"Nisan","Nison"},
       {""},
 #line 34 "strings_ashkenazi_standard.gperf"
       {"Avodah Zarah","Avoydo Zoro"},
       {""},
-#line 185 "strings_ashkenazi_standard.gperf"
+#line 187 "strings_ashkenazi_standard.gperf"
       {"Ta'anit Esther","Taanis Ester"},
       {""}, {""}, {""},
-#line 93 "strings_ashkenazi_standard.gperf"
+#line 94 "strings_ashkenazi_standard.gperf"
       {"Vayakhel","Vayakhel"},
-#line 110 "strings_ashkenazi_standard.gperf"
+#line 111 "strings_ashkenazi_standard.gperf"
       {"Chanukah: 4 Candles","Chanukko: 4 Candles"},
 #line 24 "strings_ashkenazi_standard.gperf"
       {"Nazir","Nozir"},
       {""}, {""}, {""},
-#line 109 "strings_ashkenazi_standard.gperf"
+#line 110 "strings_ashkenazi_standard.gperf"
       {"Chanukah: 3 Candles","Chanukko: 3 Candles"},
       {""},
-#line 196 "strings_ashkenazi_standard.gperf"
+#line 198 "strings_ashkenazi_standard.gperf"
       {"Yom Yerushalayim","Yom Yerusholayim"},
       {""},
-#line 99 "strings_ashkenazi_standard.gperf"
+#line 100 "strings_ashkenazi_standard.gperf"
       {"Vayigash","Vayigash"},
-#line 108 "strings_ashkenazi_standard.gperf"
+#line 109 "strings_ashkenazi_standard.gperf"
       {"Chanukah: 2 Candles","Chanukko: 2 Candles"},
       {""}, {""}, {""}, {""}, {""},
-#line 50 "strings_ashkenazi_standard.gperf"
+#line 51 "strings_ashkenazi_standard.gperf"
       {"Achrei Mot","Achrei"},
 #line 29 "strings_ashkenazi_standard.gperf"
       {"Baba Metzia","Bovo Metzio"},
-      {""},
-#line 194 "strings_ashkenazi_standard.gperf"
+#line 121 "strings_ashkenazi_standard.gperf"
+      {"Erev Shavuot","Erev Shvuos"},
+#line 196 "strings_ashkenazi_standard.gperf"
       {"Yom HaZikaron","Yom HaZikaron"},
       {""}, {""}, {""}, {""},
-#line 127 "strings_ashkenazi_standard.gperf"
+#line 128 "strings_ashkenazi_standard.gperf"
       {"Leil Selichot","Slichos"},
       {""}, {""}, {""}, {""}, {""},
-#line 171 "strings_ashkenazi_standard.gperf"
+#line 173 "strings_ashkenazi_standard.gperf"
       {"Shmini Atzeret","Shmini Atzeres"},
       {""}, {""}, {""},
 #line 20 "strings_ashkenazi_standard.gperf"
       {"Chagigah","Chagigo"},
       {""}, {""}, {""}, {""},
-#line 64 "strings_ashkenazi_standard.gperf"
+#line 65 "strings_ashkenazi_standard.gperf"
       {"Ha'Azinu","Haazinu"},
       {""}, {""},
-#line 116 "strings_ashkenazi_standard.gperf"
+#line 117 "strings_ashkenazi_standard.gperf"
       {"Days of the Omer","Oymer"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 67 "strings_ashkenazi_standard.gperf"
+#line 68 "strings_ashkenazi_standard.gperf"
       {"Ki Teitzei","Ki-Seitzei"},
-#line 184 "strings_ashkenazi_standard.gperf"
+#line 186 "strings_ashkenazi_standard.gperf"
       {"Ta'anit Bechorot","Taanis Bchoros"},
-#line 54 "strings_ashkenazi_standard.gperf"
+#line 55 "strings_ashkenazi_standard.gperf"
       {"Beha'alotcha","Bahaaloscho"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 193 "strings_ashkenazi_standard.gperf"
+#line 195 "strings_ashkenazi_standard.gperf"
       {"Yom HaShoah","Yom HaShoah"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 191 "strings_ashkenazi_standard.gperf"
+#line 193 "strings_ashkenazi_standard.gperf"
       {"Tzom Tammuz","Tzom Tammuz"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 192 "strings_ashkenazi_standard.gperf"
+#line 194 "strings_ashkenazi_standard.gperf"
       {"Yom HaAtzma'ut","Yom HaAtzma'ut"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 197 "strings_ashkenazi_standard.gperf"
+#line 199 "strings_ashkenazi_standard.gperf"
       {"Yom HaAliyah","Yom HaAliyah"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -580,7 +582,7 @@ hebcal_lookup_ashkenazi_standard (regist
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""},
-#line 105 "strings_ashkenazi_standard.gperf"
+#line 106 "strings_ashkenazi_standard.gperf"
       {"Candle lighting","Hadlokas neyros"}
     };
 
--- hebcal-4.20.orig/strings_fi.c
+++ hebcal-4.20/strings_fi.c
@@ -35,7 +35,7 @@
 #line 7 "strings_fi.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 189
+#define TOTAL_KEYWORDS 191
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 25
 #define MIN_HASH_VALUE 4
@@ -61,11 +61,11 @@ hash (register const char *str, register
         0, 461, 461, 461, 461, 461,   5, 461, 461,   0,
        45,  40,  35,  20,  15,  10,   0, 461, 461,   0,
       461, 461, 461, 461, 461,  75,  55,  90, 135,  15,
-        5, 110,  45,   0,   0,  80,   5,  40, 140,   5,
+        5, 110,  45,   0,   0,  80,   5,  40, 140,  10,
         5,  35,  70,   0,   0,   5,  10, 165, 461, 125,
        10,   0, 461, 461, 461, 461, 461,  30,  10,  15,
         0,  35,  65,   0,  80,   5,  80,   0,  75,  55,
-       65, 100,   0,   5,   0,   0,  20,   5,   0,  25,
+       65, 100,   0,   5,   0,   0,  20,   5,   0,  60,
       461,  85, 110, 125, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
@@ -118,189 +118,189 @@ hebcal_lookup_fi (register const char *s
   static struct event_title wordlist[] =
     {
       {""}, {""}, {""}, {""},
-#line 173 "strings_fi.gperf"
+#line 175 "strings_fi.gperf"
       {"Sigd","Sigd"},
       {""},
-#line 175 "strings_fi.gperf"
+#line 177 "strings_fi.gperf"
       {"Sukkot","Sukot"},
-#line 187 "strings_fi.gperf"
+#line 189 "strings_fi.gperf"
       {"Tu B'Av","Tu beav"},
-#line 176 "strings_fi.gperf"
+#line 178 "strings_fi.gperf"
       {"Sukkot I","Sukot 1. päivä"},
-#line 177 "strings_fi.gperf"
+#line 179 "strings_fi.gperf"
       {"Sukkot II","Sukot 2. päivä"},
-#line 154 "strings_fi.gperf"
+#line 156 "strings_fi.gperf"
       {"Tevet","Tevet"},
-#line 128 "strings_fi.gperf"
+#line 129 "strings_fi.gperf"
       {"Pesach","Pesach"},
       {""},
-#line 129 "strings_fi.gperf"
-      {"Pesach I","Pesach 1. päivä"},
 #line 130 "strings_fi.gperf"
+      {"Pesach I","Pesach 1. päivä"},
+#line 131 "strings_fi.gperf"
       {"Pesach II","Pesach 2. päivä"},
       {""},
 #line 15 "strings_fi.gperf"
       {"Sukkah","Suka"},
-#line 178 "strings_fi.gperf"
+#line 180 "strings_fi.gperf"
       {"Sukkot II (CH''M)","Sukot 2. päivä (Chol hamoed)"},
-#line 179 "strings_fi.gperf"
+#line 181 "strings_fi.gperf"
       {"Sukkot III (CH''M)","Sukot 3. päivä (Chol hamoed)"},
       {""},
-#line 189 "strings_fi.gperf"
+#line 191 "strings_fi.gperf"
       {"Tu B'Shvat","Tu bishvat"},
       {""},
-#line 131 "strings_fi.gperf"
-      {"Pesach II (CH''M)","Pesach 2. päivä (Chol hamoed)"},
 #line 132 "strings_fi.gperf"
+      {"Pesach II (CH''M)","Pesach 2. päivä (Chol hamoed)"},
+#line 133 "strings_fi.gperf"
       {"Pesach III (CH''M)","Pesach 3. päivä (Chol hamoed)"},
-#line 147 "strings_fi.gperf"
+#line 149 "strings_fi.gperf"
       {"Elul","Elul"},
-#line 137 "strings_fi.gperf"
-      {"Pesach VII","Pesach 7. päivä"},
 #line 138 "strings_fi.gperf"
+      {"Pesach VII","Pesach 7. päivä"},
+#line 139 "strings_fi.gperf"
       {"Pesach VIII","Pesach 8. päivä"},
-#line 182 "strings_fi.gperf"
+#line 184 "strings_fi.gperf"
       {"Sukkot VI (CH''M)","Sukot 6. päivä (Chol hamoed)"},
       {""}, {""},
 #line 25 "strings_fi.gperf"
       {"Sotah","Sota"},
       {""},
-#line 136 "strings_fi.gperf"
+#line 137 "strings_fi.gperf"
       {"Pesach VI (CH''M)","Pesach 6. päivä (Chol hamoed)"},
       {""},
-#line 90 "strings_fi.gperf"
+#line 91 "strings_fi.gperf"
       {"Tzav","Tsav"},
-#line 183 "strings_fi.gperf"
+#line 185 "strings_fi.gperf"
       {"Sukkot VII (Hoshana Raba)","Sukot 7. päivä (Hoshana raba)"},
       {""},
-#line 168 "strings_fi.gperf"
+#line 170 "strings_fi.gperf"
       {"Shavuot","Shavuot"},
       {""},
-#line 169 "strings_fi.gperf"
+#line 171 "strings_fi.gperf"
       {"Shavuot I","Shavuot 1. päivä"},
-#line 170 "strings_fi.gperf"
+#line 172 "strings_fi.gperf"
       {"Shavuot II","Shavuot 2. päivä"},
-#line 83 "strings_fi.gperf"
+#line 84 "strings_fi.gperf"
       {"Shemot","Shmot"},
 #line 33 "strings_fi.gperf"
       {"Shevuot","Shavuot"},
-      {""}, {""},
-#line 62 "strings_fi.gperf"
-      {"Eikev","Eikev"},
+      {""}, {""}, {""},
 #line 32 "strings_fi.gperf"
       {"Makkot","Makot"},
-#line 79 "strings_fi.gperf"
+#line 80 "strings_fi.gperf"
       {"Pekudei","Pekudei"},
       {""}, {""},
 #line 46 "strings_fi.gperf"
       {"Midot","Midot"},
-#line 74 "strings_fi.gperf"
+#line 75 "strings_fi.gperf"
       {"Miketz","Mikets"},
 #line 10 "strings_fi.gperf"
       {"Shabbat","Shabat"},
-#line 49 "strings_fi.gperf"
+#line 50 "strings_fi.gperf"
       {"Parashat","Parshat "},
       {""},
-#line 70 "strings_fi.gperf"
+#line 71 "strings_fi.gperf"
       {"Lech-Lecha","Lech lecha"},
       {""},
-#line 58 "strings_fi.gperf"
+#line 59 "strings_fi.gperf"
       {"Bo","Bo"},
-#line 172 "strings_fi.gperf"
+#line 174 "strings_fi.gperf"
       {"Shushan Purim","Shushan purim"},
       {""},
-#line 91 "strings_fi.gperf"
+#line 92 "strings_fi.gperf"
       {"Vaera","Vaera"},
 #line 43 "strings_fi.gperf"
       {"Meilah","Meila"},
 #line 41 "strings_fi.gperf"
       {"Temurah","Tmura"},
-#line 166 "strings_fi.gperf"
+#line 168 "strings_fi.gperf"
       {"Shabbat Shuva","Shabat shuva"},
       {""},
-#line 164 "strings_fi.gperf"
+#line 166 "strings_fi.gperf"
       {"Shabbat Rosh Chodesh","Shabat rosh chodesh"},
-#line 186 "strings_fi.gperf"
+#line 188 "strings_fi.gperf"
       {"Tish'a B'Av","Tisha beav"},
-#line 73 "strings_fi.gperf"
+#line 74 "strings_fi.gperf"
       {"Metzora","Metsora"},
 #line 12 "strings_fi.gperf"
       {"Pesachim","Psachim"},
       {""},
-#line 72 "strings_fi.gperf"
+#line 73 "strings_fi.gperf"
       {"Matot","Matot"},
       {""},
-#line 87 "strings_fi.gperf"
+#line 88 "strings_fi.gperf"
       {"Terumah","Truma"},
 #line 36 "strings_fi.gperf"
       {"Zevachim","Zvachim"},
-#line 167 "strings_fi.gperf"
+#line 169 "strings_fi.gperf"
       {"Shabbat Zachor","Shabat zachor"},
-#line 139 "strings_fi.gperf"
+#line 140 "strings_fi.gperf"
       {"Purim","Purim"},
       {""},
-#line 145 "strings_fi.gperf"
+#line 147 "strings_fi.gperf"
       {"Av","Av"},
-#line 174 "strings_fi.gperf"
+#line 176 "strings_fi.gperf"
       {"Simchat Torah","Simchat toora"},
       {""},
-#line 162 "strings_fi.gperf"
-      {"Shabbat Nachamu","Shabat nechamu"},
-#line 89 "strings_fi.gperf"
+#line 63 "strings_fi.gperf"
+      {"Eikev","Eikev"},
+#line 90 "strings_fi.gperf"
       {"Toldot","Toldot"},
-#line 80 "strings_fi.gperf"
+#line 81 "strings_fi.gperf"
       {"Pinchas","Pinchas"},
 #line 9 "strings_fi.gperf"
       {"Berachot","Brachot"},
-      {""}, {""},
-#line 69 "strings_fi.gperf"
+      {""},
+#line 164 "strings_fi.gperf"
+      {"Shabbat Nachamu","Shabat nechamu"},
+#line 70 "strings_fi.gperf"
       {"Korach","Korach "},
-#line 134 "strings_fi.gperf"
+#line 135 "strings_fi.gperf"
       {"Pesach Sheni","Pesach Sheni"},
       {""}, {""},
-#line 148 "strings_fi.gperf"
+#line 150 "strings_fi.gperf"
       {"Iyyar","Ijar"},
       {""},
 #line 42 "strings_fi.gperf"
       {"Keritot","Kritot"},
-#line 163 "strings_fi.gperf"
+#line 165 "strings_fi.gperf"
       {"Shabbat Parah","Shabat para"},
-#line 57 "strings_fi.gperf"
+#line 58 "strings_fi.gperf"
       {"Beshalach","Beshalach"},
 #line 45 "strings_fi.gperf"
       {"Tamid","Tamid"},
-#line 165 "strings_fi.gperf"
+#line 167 "strings_fi.gperf"
       {"Shabbat Shekalim","Shabat shkalim"},
-#line 66 "strings_fi.gperf"
+#line 67 "strings_fi.gperf"
       {"Ki Tavo","Ki tavo"},
 #line 39 "strings_fi.gperf"
       {"Bechorot","Bechorot"},
       {""},
-#line 188 "strings_fi.gperf"
+#line 190 "strings_fi.gperf"
       {"Tu BiShvat","Tu bishvat"},
-#line 96 "strings_fi.gperf"
+#line 97 "strings_fi.gperf"
       {"Vayera","Vajera"},
-#line 94 "strings_fi.gperf"
+#line 95 "strings_fi.gperf"
       {"Vayechi","Vajechi"},
-#line 56 "strings_fi.gperf"
+#line 57 "strings_fi.gperf"
       {"Bereshit","Bereshit"},
       {""},
-#line 152 "strings_fi.gperf"
+#line 154 "strings_fi.gperf"
       {"Sivan","Sivan"},
 #line 11 "strings_fi.gperf"
       {"Eruvin","Eruvin"},
       {""},
 #line 13 "strings_fi.gperf"
       {"Shekalim","Shkalim"},
-#line 142 "strings_fi.gperf"
+#line 144 "strings_fi.gperf"
       {"Adar","Adar"},
-#line 53 "strings_fi.gperf"
+#line 54 "strings_fi.gperf"
       {"Bechukotai","Bechukotai"},
-#line 60 "strings_fi.gperf"
+#line 61 "strings_fi.gperf"
       {"Chukat","Chukat"},
-#line 85 "strings_fi.gperf"
+#line 86 "strings_fi.gperf"
       {"Shoftim","Shoftim"},
-#line 98 "strings_fi.gperf"
+#line 99 "strings_fi.gperf"
       {"Vayetzei","Vajetse"},
       {""},
 #line 30 "strings_fi.gperf"
@@ -309,125 +309,125 @@ hebcal_lookup_fi (register const char *s
       {"Taanit","Taanit"},
 #line 40 "strings_fi.gperf"
       {"Arachin","Arachin"},
-#line 88 "strings_fi.gperf"
+#line 89 "strings_fi.gperf"
       {"Tetzaveh","Tetsave"},
-#line 63 "strings_fi.gperf"
+#line 64 "strings_fi.gperf"
       {"Emor","Emor"},
       {""},
-#line 123 "strings_fi.gperf"
+#line 124 "strings_fi.gperf"
       {"Erev Tish'a B'Av","Tisha  beav -aatto "},
 #line 22 "strings_fi.gperf"
       {"Ketubot","Ketubot"},
-#line 97 "strings_fi.gperf"
+#line 98 "strings_fi.gperf"
       {"Vayeshev","Vajeshev"},
-#line 75 "strings_fi.gperf"
+#line 76 "strings_fi.gperf"
       {"Mishpatim","Mishpatim"},
-#line 71 "strings_fi.gperf"
+#line 72 "strings_fi.gperf"
       {"Masei","Masei"},
-#line 151 "strings_fi.gperf"
+#line 153 "strings_fi.gperf"
       {"Sh'vat","Shvat"},
-#line 82 "strings_fi.gperf"
+#line 83 "strings_fi.gperf"
       {"Sh'lach","Shlach "},
       {""}, {""},
-#line 92 "strings_fi.gperf"
+#line 93 "strings_fi.gperf"
       {"Vaetchanan","Vaetchanan"},
-#line 143 "strings_fi.gperf"
+#line 145 "strings_fi.gperf"
       {"Adar I","Adar I"},
-#line 144 "strings_fi.gperf"
+#line 146 "strings_fi.gperf"
       {"Adar II","Adar II"},
 #line 37 "strings_fi.gperf"
       {"Menachot","Menachot"},
       {""},
 #line 19 "strings_fi.gperf"
       {"Moed Katan","Moed katan"},
-#line 181 "strings_fi.gperf"
+#line 183 "strings_fi.gperf"
       {"Sukkot V (CH''M)","Sukot 5. päivä (Chol hamoed)"},
-#line 119 "strings_fi.gperf"
+#line 120 "strings_fi.gperf"
       {"Erev Rosh Hashana","Rosh hashana aatto"},
       {""}, {""},
-#line 55 "strings_fi.gperf"
+#line 56 "strings_fi.gperf"
       {"Behar","Behar"},
-#line 135 "strings_fi.gperf"
+#line 136 "strings_fi.gperf"
       {"Pesach V (CH''M)","Pesach 5. päivä (Chol hamoed)"},
-#line 61 "strings_fi.gperf"
+#line 62 "strings_fi.gperf"
       {"Devarim","Dvarim"},
-#line 125 "strings_fi.gperf"
+#line 126 "strings_fi.gperf"
       {"Havdalah","Havdala"},
       {""},
-#line 76 "strings_fi.gperf"
+#line 77 "strings_fi.gperf"
       {"Nasso","Naso"},
       {""},
 #line 23 "strings_fi.gperf"
       {"Nedarim","Nedarim"},
-#line 190 "strings_fi.gperf"
+#line 192 "strings_fi.gperf"
       {"Tzom Gedaliah","Tzom Gedalja"},
       {""},
-#line 103 "strings_fi.gperf"
+#line 104 "strings_fi.gperf"
       {"Yitro","Jitro"},
-#line 149 "strings_fi.gperf"
+#line 151 "strings_fi.gperf"
       {"Kislev","Kislev"},
-#line 159 "strings_fi.gperf"
+#line 161 "strings_fi.gperf"
       {"Shabbat HaChodesh","Shabat hachodesh"},
-#line 52 "strings_fi.gperf"
+#line 53 "strings_fi.gperf"
       {"Bamidbar","Bamidbar"},
       {""},
-#line 101 "strings_fi.gperf"
+#line 102 "strings_fi.gperf"
       {"Vayishlach","Vajishlach"},
 #line 47 "strings_fi.gperf"
       {"Niddah","Nida"},
 #line 38 "strings_fi.gperf"
       {"Chullin","Chulin"},
       {""}, {""},
-#line 118 "strings_fi.gperf"
+#line 119 "strings_fi.gperf"
       {"Erev Purim","Purim aatto"},
-#line 84 "strings_fi.gperf"
+#line 85 "strings_fi.gperf"
       {"Shmini","Shmini"},
 #line 35 "strings_fi.gperf"
       {"Horayot","Horajot"},
-#line 65 "strings_fi.gperf"
+#line 66 "strings_fi.gperf"
       {"Kedoshim","Kedoshim"},
       {""},
-#line 124 "strings_fi.gperf"
+#line 125 "strings_fi.gperf"
       {"Erev Yom Kippur","Jom kipur -aatto"},
       {""},
-#line 68 "strings_fi.gperf"
+#line 69 "strings_fi.gperf"
       {"Ki Tisa","Ki Tisa"},
       {""}, {""},
-#line 160 "strings_fi.gperf"
+#line 162 "strings_fi.gperf"
       {"Shabbat HaGadol","Shabat hagadol"},
-#line 117 "strings_fi.gperf"
+#line 118 "strings_fi.gperf"
       {"Erev Pesach","Pesach aatto"},
-#line 155 "strings_fi.gperf"
+#line 157 "strings_fi.gperf"
       {"Rosh Hashana","Rosh hashana"},
-#line 121 "strings_fi.gperf"
+#line 122 "strings_fi.gperf"
       {"Erev Simchat Torah","Simchat toora  -aatto"},
-#line 156 "strings_fi.gperf"
+#line 158 "strings_fi.gperf"
       {"Rosh Hashana I","Rosh hashana 1. päivä"},
-#line 157 "strings_fi.gperf"
+#line 159 "strings_fi.gperf"
       {"Rosh Hashana II","Rosh hashana 2. päivä"},
-#line 122 "strings_fi.gperf"
+#line 123 "strings_fi.gperf"
       {"Erev Sukkot","Sukot-aatto"},
-#line 100 "strings_fi.gperf"
+#line 101 "strings_fi.gperf"
       {"Vayikra","Vajikra"},
       {""}, {""},
-#line 78 "strings_fi.gperf"
+#line 79 "strings_fi.gperf"
       {"Noach","Noach"},
-#line 140 "strings_fi.gperf"
+#line 141 "strings_fi.gperf"
       {"Purim Katan","Purim katan"},
-#line 180 "strings_fi.gperf"
+#line 182 "strings_fi.gperf"
       {"Sukkot IV (CH''M)","Sukot 4. päivä (Chol hamoed)"},
 #line 18 "strings_fi.gperf"
       {"Megillah","Megila"},
 #line 14 "strings_fi.gperf"
       {"Yoma","Joma"},
-#line 153 "strings_fi.gperf"
+#line 155 "strings_fi.gperf"
       {"Tamuz","Tamuz"},
-#line 102 "strings_fi.gperf"
+#line 103 "strings_fi.gperf"
       {"Vezot Haberakhah","Vezot habracha"},
-#line 133 "strings_fi.gperf"
+#line 134 "strings_fi.gperf"
       {"Pesach IV (CH''M)","Pesach 4. päivä (Chol hamoed)"},
       {""}, {""},
-#line 81 "strings_fi.gperf"
+#line 82 "strings_fi.gperf"
       {"Re'eh","Re'e"},
       {""},
 #line 16 "strings_fi.gperf"
@@ -435,140 +435,142 @@ hebcal_lookup_fi (register const char *s
       {""},
 #line 27 "strings_fi.gperf"
       {"Kiddushin","Kidushin"},
-#line 195 "strings_fi.gperf"
+#line 197 "strings_fi.gperf"
       {"Yom Kippur","Jom kipur"},
-#line 86 "strings_fi.gperf"
+#line 87 "strings_fi.gperf"
       {"Tazria","Tazria"},
 #line 21 "strings_fi.gperf"
       {"Yevamot","Jevamot"},
       {""}, {""}, {""}, {""}, {""},
-#line 146 "strings_fi.gperf"
+#line 148 "strings_fi.gperf"
       {"Cheshvan","Cheshvan"},
-#line 95 "strings_fi.gperf"
+#line 96 "strings_fi.gperf"
       {"Vayeilech","Vajelech"},
       {""}, {""}, {""},
-#line 106 "strings_fi.gperf"
+#line 107 "strings_fi.gperf"
       {"Chanukah","Hanuka"},
       {""},
-#line 51 "strings_fi.gperf"
+#line 52 "strings_fi.gperf"
       {"Balak","Balak"},
       {""}, {""}, {""}, {""},
 #line 28 "strings_fi.gperf"
       {"Baba Kamma","Bava kama"},
       {""},
-#line 115 "strings_fi.gperf"
+#line 116 "strings_fi.gperf"
       {"Chanukah: 8th Day","Hanuka 8. päivä"},
-#line 107 "strings_fi.gperf"
+#line 108 "strings_fi.gperf"
       {"Chanukah: 1 Candle","Hanuka 1. kynttilä"},
-#line 114 "strings_fi.gperf"
+#line 115 "strings_fi.gperf"
       {"Chanukah: 8 Candles","Hanuka 8. kynttilä"},
       {""}, {""},
-#line 161 "strings_fi.gperf"
+#line 163 "strings_fi.gperf"
       {"Shabbat Machar Chodesh","Shabat machar chodesh"},
-      {""},
-#line 158 "strings_fi.gperf"
+#line 49 "strings_fi.gperf"
+      {"Daf Yomi","Daf jomi"},
+#line 160 "strings_fi.gperf"
       {"Shabbat Chazon","Shabat chazon"},
-#line 126 "strings_fi.gperf"
+#line 127 "strings_fi.gperf"
       {"Lag BaOmer","Lag baomer"},
       {""}, {""}, {""},
-#line 113 "strings_fi.gperf"
+#line 114 "strings_fi.gperf"
       {"Chanukah: 7 Candles","Hanuka 7. kynttilä"},
 #line 48 "strings_fi.gperf"
       {"Daf Yomi: %s %d","Daf jomi: %s %d"},
 #line 44 "strings_fi.gperf"
       {"Kinnim","Kinim"},
       {""},
-#line 77 "strings_fi.gperf"
+#line 78 "strings_fi.gperf"
       {"Nitzavim","Nitsavim"},
-#line 112 "strings_fi.gperf"
+#line 113 "strings_fi.gperf"
       {"Chanukah: 6 Candles","Hanuka 6. kynttilä"},
 #line 26 "strings_fi.gperf"
       {"Gitin","Gitin"},
-#line 59 "strings_fi.gperf"
+#line 60 "strings_fi.gperf"
       {"Chayei Sara","Chajei Sara"},
-#line 120 "strings_fi.gperf"
-      {"Erev Shavuot","Shavuot aatto"},
+#line 143 "strings_fi.gperf"
+      {"Rosh Chodesh","Rosh chodesh"},
       {""},
-#line 111 "strings_fi.gperf"
+#line 112 "strings_fi.gperf"
       {"Chanukah: 5 Candles","Hanuka 5. kynttilä"},
-#line 141 "strings_fi.gperf"
+#line 142 "strings_fi.gperf"
       {"Rosh Chodesh %s","Rosh chodesh %s"},
       {""}, {""},
-#line 104 "strings_fi.gperf"
+#line 105 "strings_fi.gperf"
       {"Asara B'Tevet","Asara betevet"},
 #line 31 "strings_fi.gperf"
       {"Sanhedrin","Sanhedrin"},
-#line 150 "strings_fi.gperf"
+#line 152 "strings_fi.gperf"
       {"Nisan","Nisan"},
       {""},
 #line 34 "strings_fi.gperf"
       {"Avodah Zarah","Avoda zara"},
       {""},
-#line 185 "strings_fi.gperf"
+#line 187 "strings_fi.gperf"
       {"Ta'anit Esther","Ta'anit Ester"},
       {""}, {""}, {""},
-#line 93 "strings_fi.gperf"
+#line 94 "strings_fi.gperf"
       {"Vayakhel","Vajakel"},
-#line 110 "strings_fi.gperf"
+#line 111 "strings_fi.gperf"
       {"Chanukah: 4 Candles","Hanuka 4. kynttilä"},
 #line 24 "strings_fi.gperf"
       {"Nazir","Nazir"},
       {""}, {""}, {""},
-#line 109 "strings_fi.gperf"
+#line 110 "strings_fi.gperf"
       {"Chanukah: 3 Candles","Hanuka 3. kynttilä"},
       {""},
-#line 196 "strings_fi.gperf"
+#line 198 "strings_fi.gperf"
       {"Yom Yerushalayim","Jom Jerushalaim"},
       {""},
-#line 99 "strings_fi.gperf"
+#line 100 "strings_fi.gperf"
       {"Vayigash","Vajigash"},
-#line 108 "strings_fi.gperf"
+#line 109 "strings_fi.gperf"
       {"Chanukah: 2 Candles","Hanuka 2. kynttilä"},
       {""}, {""}, {""}, {""}, {""},
-#line 50 "strings_fi.gperf"
+#line 51 "strings_fi.gperf"
       {"Achrei Mot","Achrei mot"},
 #line 29 "strings_fi.gperf"
       {"Baba Metzia","Bava metsia"},
-      {""},
-#line 194 "strings_fi.gperf"
+#line 121 "strings_fi.gperf"
+      {"Erev Shavuot","Shavuot aatto"},
+#line 196 "strings_fi.gperf"
       {"Yom HaZikaron","Jom hazikaron"},
       {""}, {""}, {""}, {""},
-#line 127 "strings_fi.gperf"
+#line 128 "strings_fi.gperf"
       {"Leil Selichot","Slichot-ilta (aatto) "},
       {""}, {""}, {""}, {""}, {""},
-#line 171 "strings_fi.gperf"
+#line 173 "strings_fi.gperf"
       {"Shmini Atzeret","Shmini atseret"},
       {""}, {""}, {""},
 #line 20 "strings_fi.gperf"
       {"Chagigah","Chagiga"},
       {""}, {""}, {""}, {""},
-#line 64 "strings_fi.gperf"
+#line 65 "strings_fi.gperf"
       {"Ha'Azinu","Ha'azinu"},
       {""}, {""},
-#line 116 "strings_fi.gperf"
+#line 117 "strings_fi.gperf"
       {"Days of the Omer","Omerin päivä"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 67 "strings_fi.gperf"
+#line 68 "strings_fi.gperf"
       {"Ki Teitzei","Ki tetse"},
-#line 184 "strings_fi.gperf"
+#line 186 "strings_fi.gperf"
       {"Ta'anit Bechorot","Ta'anit bechorot"},
-#line 54 "strings_fi.gperf"
+#line 55 "strings_fi.gperf"
       {"Beha'alotcha","Behalotcha"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 193 "strings_fi.gperf"
+#line 195 "strings_fi.gperf"
       {"Yom HaShoah","Jom hashoa"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 191 "strings_fi.gperf"
+#line 193 "strings_fi.gperf"
       {"Tzom Tammuz","Tzom tamuz"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 192 "strings_fi.gperf"
+#line 194 "strings_fi.gperf"
       {"Yom HaAtzma'ut","Jom ha'atsmaut"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 197 "strings_fi.gperf"
+#line 199 "strings_fi.gperf"
       {"Yom HaAliyah","Jom ha'alija"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -580,7 +582,7 @@ hebcal_lookup_fi (register const char *s
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""},
-#line 105 "strings_fi.gperf"
+#line 106 "strings_fi.gperf"
       {"Candle lighting","Kynttilöiden sytytys"}
     };
 
--- hebcal-4.20.orig/strings_fr.c
+++ hebcal-4.20/strings_fr.c
@@ -35,7 +35,7 @@
 #line 7 "strings_fr.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 199
+#define TOTAL_KEYWORDS 200
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 53
 #define MIN_HASH_VALUE 4
@@ -58,15 +58,15 @@ hash (register const char *str, register
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
       466, 466,   0,   0, 466, 466, 466,   0, 466,  55,
-      100, 466, 466, 466, 466, 466,  45, 466, 466,   5,
+      100, 466, 466, 466, 466, 466,  75, 466, 466,   5,
        40,  35,  30,  20,  15,  10,   5, 466, 466,   0,
-      466, 466, 466, 466, 466, 150,   5, 105, 105,   0,
-       10,  35, 115,  20,  40,  35,  35,  80,  20,  30,
-        0,  10, 170,  40,   5,  15,  95,   0, 466, 115,
+      466, 466, 466, 466, 466, 150,   5, 105,  70,   0,
+       10,  35,  85,  20,  40,  35,   5,  80,  20,  30,
+        0,  10, 150,  40,   5,  15,  95,   0, 466, 115,
       105,  10, 466, 466, 466, 466, 466,  10,   5,  35,
         5,   5,  50,   0, 105,  10,  55,  90,  75,  10,
         0,  25,  70,   0,   0,   0,   0,   0,   5,  35,
-      466, 110, 150, 165, 466, 466, 466, 466, 466, 466,
+      466, 110, 185, 165, 466, 466, 466, 466, 466, 466,
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
@@ -118,7 +118,7 @@ hebcal_lookup_fr (register const char *s
   static struct event_title wordlist[] =
     {
       {""}, {""}, {""}, {""},
-#line 157 "strings_fr.gperf"
+#line 158 "strings_fr.gperf"
       {"Elul","Eloul"},
 #line 149 "strings_fr.gperf"
       {"Purim","Pourim"},
@@ -135,7 +135,7 @@ hebcal_lookup_fr (register const char *s
 #line 66 "strings_fr.gperf"
       {"Bereshit","Berechit"},
       {""},
-#line 164 "strings_fr.gperf"
+#line 165 "strings_fr.gperf"
       {"Tevet","Tévet"},
       {""},
 #line 90 "strings_fr.gperf"
@@ -182,7 +182,7 @@ hebcal_lookup_fr (register const char *s
       {"Keritot","Keritot"},
 #line 87 "strings_fr.gperf"
       {"Nitzavim","Nitzavim"},
-#line 183 "strings_fr.gperf"
+#line 184 "strings_fr.gperf"
       {"Sigd","Sigd"},
 #line 88 "strings_fr.gperf"
       {"Noach","Noah̲"},
@@ -193,7 +193,7 @@ hebcal_lookup_fr (register const char *s
 #line 131 "strings_fr.gperf"
       {"Erev Simchat Torah","Erev Simh̲at Torah"},
       {""},
-#line 160 "strings_fr.gperf"
+#line 161 "strings_fr.gperf"
       {"Nisan","Nissan"},
       {""},
 #line 55 "strings_fr.gperf"
@@ -211,9 +211,9 @@ hebcal_lookup_fr (register const char *s
       {"Bechukotai","Beh̲oukotaï"},
 #line 11 "strings_fr.gperf"
       {"Eruvin","Erouvin"},
-#line 178 "strings_fr.gperf"
+#line 179 "strings_fr.gperf"
       {"Shavuot","Chavou'ot"},
-#line 200 "strings_fr.gperf"
+#line 201 "strings_fr.gperf"
       {"Tzom Gedaliah","Tzom Guedalyah"},
 #line 67 "strings_fr.gperf"
       {"Beshalach","Bechalah̲"},
@@ -230,22 +230,23 @@ hebcal_lookup_fr (register const char *s
       {""},
 #line 95 "strings_fr.gperf"
       {"Shoftim","Choftim"},
-#line 182 "strings_fr.gperf"
+#line 183 "strings_fr.gperf"
       {"Shushan Purim","Chouchan Pourim"},
 #line 140 "strings_fr.gperf"
       {"Pesach II","Pessah̲ II"},
-#line 162 "strings_fr.gperf"
+#line 163 "strings_fr.gperf"
       {"Sivan","Sivan"},
 #line 17 "strings_fr.gperf"
       {"Taanit","Ta'anit"},
 #line 22 "strings_fr.gperf"
       {"Ketubot","Ketoubot"},
       {""}, {""},
-#line 198 "strings_fr.gperf"
+#line 199 "strings_fr.gperf"
       {"Tu BiShvat","Tou biChvat"},
 #line 94 "strings_fr.gperf"
       {"Shmini","Chemini"},
-      {""},
+#line 71 "strings_fr.gperf"
+      {"Devarim","Devarim"},
 #line 142 "strings_fr.gperf"
       {"Pesach III (CH''M)","Pessah̲ III (H̲''M)"},
       {""},
@@ -254,13 +255,13 @@ hebcal_lookup_fr (register const char *s
       {""},
 #line 130 "strings_fr.gperf"
       {"Erev Shavuot","Erev Chavou'ot"},
-#line 184 "strings_fr.gperf"
+#line 185 "strings_fr.gperf"
       {"Simchat Torah","Simh̲at Torah"},
 #line 27 "strings_fr.gperf"
       {"Kiddushin","Kiddouchin"},
 #line 46 "strings_fr.gperf"
       {"Midot","Midot"},
-#line 159 "strings_fr.gperf"
+#line 160 "strings_fr.gperf"
       {"Kislev","Kislav"},
 #line 10 "strings_fr.gperf"
       {"Shabbat","Chabbat"},
@@ -283,33 +284,33 @@ hebcal_lookup_fr (register const char *s
       {"Meilah","Me'ilah"},
 #line 89 "strings_fr.gperf"
       {"Pekudei","Pekoudé"},
-#line 176 "strings_fr.gperf"
+#line 177 "strings_fr.gperf"
       {"Shabbat Shuva","Chabbat Chouvah"},
-#line 179 "strings_fr.gperf"
-      {"Shavuot I","Chavou'ot I"},
 #line 180 "strings_fr.gperf"
+      {"Shavuot I","Chavou'ot I"},
+#line 181 "strings_fr.gperf"
       {"Shavuot II","Chavou'ot II"},
-#line 161 "strings_fr.gperf"
+#line 162 "strings_fr.gperf"
       {"Sh'vat","Chevat"},
 #line 92 "strings_fr.gperf"
       {"Sh'lach","Chelah̲ Lekha"},
-#line 173 "strings_fr.gperf"
+#line 174 "strings_fr.gperf"
       {"Shabbat Parah","Chabbat Parah"},
-#line 195 "strings_fr.gperf"
+#line 196 "strings_fr.gperf"
       {"Ta'anit Esther","Ta'anit Esther"},
 #line 101 "strings_fr.gperf"
       {"Vaera","Vaéra"},
-#line 175 "strings_fr.gperf"
+#line 176 "strings_fr.gperf"
       {"Shabbat Shekalim","Chabbat Chekalim"},
-#line 197 "strings_fr.gperf"
+#line 198 "strings_fr.gperf"
       {"Tu B'Av","Tou beAv"},
       {""}, {""},
 #line 65 "strings_fr.gperf"
       {"Behar","Behar"},
 #line 70 "strings_fr.gperf"
       {"Chukat","H̲oukat"},
-#line 71 "strings_fr.gperf"
-      {"Devarim","Devarim"},
+#line 129 "strings_fr.gperf"
+      {"Erev Rosh Hashana","Erev Roch Hachanah"},
 #line 39 "strings_fr.gperf"
       {"Bechorot","Bekhorot"},
       {""},
@@ -322,13 +323,13 @@ hebcal_lookup_fr (register const char *s
 #line 98 "strings_fr.gperf"
       {"Tetzaveh","Tétzaveh"},
       {""},
-#line 199 "strings_fr.gperf"
+#line 200 "strings_fr.gperf"
       {"Tu B'Shvat","Tou biChvat"},
 #line 127 "strings_fr.gperf"
       {"Erev Pesach","Erev Pessah̲"},
 #line 21 "strings_fr.gperf"
       {"Yevamot","Yevamot"},
-#line 156 "strings_fr.gperf"
+#line 157 "strings_fr.gperf"
       {"Cheshvan","H̲echvan"},
 #line 14 "strings_fr.gperf"
       {"Yoma","Yoma"},
@@ -339,7 +340,7 @@ hebcal_lookup_fr (register const char *s
       {"Zevachim","Zevah̲im"},
 #line 31 "strings_fr.gperf"
       {"Sanhedrin","Sanhédrin"},
-#line 158 "strings_fr.gperf"
+#line 159 "strings_fr.gperf"
       {"Iyyar","Iyar"},
       {""}, {""},
 #line 56 "strings_fr.gperf"
@@ -353,23 +354,20 @@ hebcal_lookup_fr (register const char *s
 #line 143 "strings_fr.gperf"
       {"Pesach IV (CH''M)","Pessah̲ IV (H̲''M)"},
       {""},
-#line 177 "strings_fr.gperf"
+#line 178 "strings_fr.gperf"
       {"Shabbat Zachor","Chabbat Zakhor"},
-#line 174 "strings_fr.gperf"
+#line 175 "strings_fr.gperf"
       {"Shabbat Rosh Chodesh","Chabbat Roch H̲odech"},
-      {""},
-#line 129 "strings_fr.gperf"
-      {"Erev Rosh Hashana","Erev Roch Hachanah"},
-      {""}, {""},
+      {""}, {""}, {""}, {""},
 #line 147 "strings_fr.gperf"
       {"Pesach VII","Pessah̲ VII"},
       {""},
-#line 155 "strings_fr.gperf"
+#line 156 "strings_fr.gperf"
       {"Av","Av"},
 #line 49 "strings_fr.gperf"
       {"Unable to allocate memory for holiday.","Impossible d'allouer de la mémoire pour la fête."},
       {""},
-#line 170 "strings_fr.gperf"
+#line 171 "strings_fr.gperf"
       {"Shabbat HaGadol","Chabbat haGadol"},
 #line 99 "strings_fr.gperf"
       {"Toldot","Toledot"},
@@ -379,36 +377,47 @@ hebcal_lookup_fr (register const char *s
 #line 61 "strings_fr.gperf"
       {"Balak","Balak"},
       {""},
-#line 171 "strings_fr.gperf"
+#line 172 "strings_fr.gperf"
       {"Shabbat Machar Chodesh","Chabbat Mah̲ar H̲odech"},
       {""},
-#line 152 "strings_fr.gperf"
+#line 153 "strings_fr.gperf"
       {"Adar","Adar"},
-#line 172 "strings_fr.gperf"
+#line 173 "strings_fr.gperf"
       {"Shabbat Nachamu","Chabbat Nah̲amou"},
-#line 153 "strings_fr.gperf"
-      {"Adar I","Adar I"},
 #line 154 "strings_fr.gperf"
+      {"Adar I","Adar I"},
+#line 155 "strings_fr.gperf"
       {"Adar II","Adar II"},
-      {""}, {""},
+      {""},
+#line 53 "strings_fr.gperf"
+      {"Date out of range in input file. Skipping line %s","Date hors de portée dans le fichier. Ignore la ligne %s"},
 #line 80 "strings_fr.gperf"
       {"Lech-Lecha","Lekh Lekha"},
 #line 148 "strings_fr.gperf"
       {"Pesach VIII","Pessah̲ VIII"},
-      {""}, {""}, {""},
-#line 24 "strings_fr.gperf"
-      {"Nazir","Nazir"},
+#line 166 "strings_fr.gperf"
+      {"Rosh Hashana","Roch Hachanah"},
+#line 57 "strings_fr.gperf"
+      {"Date out of range in yahrtzeit file. Skipping line %s","Date hors de portée dans le fichier des Yahrzeit. Ignore la ligne %s"},
+#line 167 "strings_fr.gperf"
+      {"Rosh Hashana I","Roch Hachanah I"},
+#line 168 "strings_fr.gperf"
+      {"Rosh Hashana II","Roch Hachanah II"},
 #line 84 "strings_fr.gperf"
       {"Miketz","Miketz"},
 #line 40 "strings_fr.gperf"
       {"Arachin","Arah̲in"},
-      {""}, {""}, {""},
+      {""},
+#line 169 "strings_fr.gperf"
+      {"Shabbat Chazon","Chabbat H̲azon"},
+#line 136 "strings_fr.gperf"
+      {"Lag BaOmer","Lag ba'Omer"},
 #line 132 "strings_fr.gperf"
       {"Erev Sukkot","Erev Soukkot"},
 #line 141 "strings_fr.gperf"
       {"Pesach II (CH''M)","Pessah̲ II (H̲''M)"},
       {""}, {""},
-#line 163 "strings_fr.gperf"
+#line 164 "strings_fr.gperf"
       {"Tamuz","Tammouz"},
       {""},
 #line 16 "strings_fr.gperf"
@@ -418,57 +427,52 @@ hebcal_lookup_fr (register const char *s
       {"Yitro","Yitro"},
 #line 58 "strings_fr.gperf"
       {"improper sedra year type calculated.","mauvais calcul de type d'année de sidra."},
-#line 165 "strings_fr.gperf"
-      {"Rosh Hashana","Roch Hachanah"},
-      {""},
-#line 166 "strings_fr.gperf"
-      {"Rosh Hashana I","Roch Hachanah I"},
-#line 167 "strings_fr.gperf"
-      {"Rosh Hashana II","Roch Hachanah II"},
+#line 152 "strings_fr.gperf"
+      {"Rosh Chodesh","Roch H̲odech"},
+      {""}, {""},
+#line 151 "strings_fr.gperf"
+      {"Rosh Chodesh %s","Roch H̲odech %s"},
 #line 29 "strings_fr.gperf"
       {"Baba Metzia","Baba Métzia"},
       {""}, {""}, {""}, {""},
-#line 201 "strings_fr.gperf"
-      {"Tzom Tammuz","Tzom Tammouz"},
+#line 126 "strings_fr.gperf"
+      {"Days of the Omer","Jours de l'Omer"},
       {""},
 #line 18 "strings_fr.gperf"
       {"Megillah","Meguilah"},
-#line 53 "strings_fr.gperf"
-      {"Date out of range in input file. Skipping line %s","Date hors de portée dans le fichier. Ignore la ligne %s"},
-      {""},
-#line 185 "strings_fr.gperf"
+      {""}, {""},
+#line 186 "strings_fr.gperf"
       {"Sukkot","Soukkot"},
       {""},
-#line 57 "strings_fr.gperf"
-      {"Date out of range in yahrtzeit file. Skipping line %s","Date hors de portée dans le fichier des Yahrzeit. Ignore la ligne %s"},
+#line 135 "strings_fr.gperf"
+      {"Havdalah","Havdalah"},
       {""},
-#line 136 "strings_fr.gperf"
-      {"Lag BaOmer","Lag ba'Omer"},
+#line 24 "strings_fr.gperf"
+      {"Nazir","Nazir"},
 #line 106 "strings_fr.gperf"
       {"Vayera","Vayéra"},
-      {""}, {""},
-#line 168 "strings_fr.gperf"
-      {"Shabbat Chazon","Chabbat H̲azon"},
-#line 151 "strings_fr.gperf"
-      {"Rosh Chodesh %s","Roch H̲odech %s"},
-#line 96 "strings_fr.gperf"
-      {"Tazria","Tazri'a"},
+      {""}, {""}, {""},
+#line 206 "strings_fr.gperf"
+      {"Yom Kippur","Yom Kippour"},
+      {""},
 #line 104 "strings_fr.gperf"
       {"Vayechi","Vayeh̲i"},
 #line 107 "strings_fr.gperf"
       {"Vayeshev","Vayéchev"},
-      {""}, {""},
+      {""},
+#line 91 "strings_fr.gperf"
+      {"Re'eh","Reéh"},
 #line 145 "strings_fr.gperf"
       {"Pesach V (CH''M)","Pessah̲ V (H̲''M)"},
       {""},
 #line 108 "strings_fr.gperf"
       {"Vayetzei","Vayétzé"},
       {""}, {""},
-#line 196 "strings_fr.gperf"
+#line 197 "strings_fr.gperf"
       {"Tish'a B'Av","Tich'ah beAv"},
-#line 169 "strings_fr.gperf"
+#line 170 "strings_fr.gperf"
       {"Shabbat HaChodesh","Chabbat haH̲odech"},
-#line 186 "strings_fr.gperf"
+#line 187 "strings_fr.gperf"
       {"Sukkot I","Soukkot I"},
       {""},
 #line 111 "strings_fr.gperf"
@@ -479,23 +483,17 @@ hebcal_lookup_fr (register const char *s
 #line 116 "strings_fr.gperf"
       {"Chanukah","H̲anoukah"},
       {""}, {""},
-#line 126 "strings_fr.gperf"
-      {"Days of the Omer","Jours de l'Omer"},
-      {""},
-#line 135 "strings_fr.gperf"
-      {"Havdalah","Havdalah"},
-      {""},
-#line 91 "strings_fr.gperf"
-      {"Re'eh","Reéh"},
-#line 194 "strings_fr.gperf"
+#line 202 "strings_fr.gperf"
+      {"Tzom Tammuz","Tzom Tammouz"},
+      {""}, {""}, {""}, {""},
+#line 195 "strings_fr.gperf"
       {"Ta'anit Bechorot","Ta'anit Bekhorot"},
       {""},
-#line 204 "strings_fr.gperf"
+#line 205 "strings_fr.gperf"
       {"Yom HaZikaron","Yom haZikaron"},
-#line 181 "strings_fr.gperf"
+#line 182 "strings_fr.gperf"
       {"Shmini Atzeret","Chemini Atzéret"},
-#line 205 "strings_fr.gperf"
-      {"Yom Kippur","Yom Kippour"},
+      {""},
 #line 32 "strings_fr.gperf"
       {"Makkot","Makot"},
 #line 125 "strings_fr.gperf"
@@ -504,33 +502,38 @@ hebcal_lookup_fr (register const char *s
       {"Chanukah: 1 Candle","H̲anoukah: 1 Bougie"},
 #line 124 "strings_fr.gperf"
       {"Chanukah: 8 Candles","H̲anoukah: 8 Bougies"},
-      {""}, {""}, {""},
+#line 48 "strings_fr.gperf"
+      {"Daf Yomi: %s %d","Daf Yomi: %s %d"},
+#line 96 "strings_fr.gperf"
+      {"Tazria","Tazri'a"},
+      {""},
 #line 114 "strings_fr.gperf"
       {"Asara B'Tevet","Assarah beTévet"},
 #line 123 "strings_fr.gperf"
       {"Chanukah: 7 Candles","H̲anoukah: 7 Bougies"},
       {""},
-#line 206 "strings_fr.gperf"
+#line 207 "strings_fr.gperf"
       {"Yom Yerushalayim","Yom Yerouchalayim"},
 #line 146 "strings_fr.gperf"
       {"Pesach VI (CH''M)","Pessah̲ VI (H̲''M)"},
       {""},
 #line 122 "strings_fr.gperf"
       {"Chanukah: 6 Candles","H̲anoukah: 6 Bougies"},
-      {""}, {""}, {""}, {""},
+      {""}, {""}, {""},
+#line 137 "strings_fr.gperf"
+      {"Leil Selichot","Lel Selih̲ot"},
 #line 121 "strings_fr.gperf"
       {"Chanukah: 5 Candles","H̲anoukah: 5 Bougies"},
       {""}, {""}, {""}, {""},
-#line 187 "strings_fr.gperf"
+#line 188 "strings_fr.gperf"
       {"Sukkot II","Soukkot II"},
+      {""}, {""}, {""}, {""},
+#line 120 "strings_fr.gperf"
+      {"Chanukah: 4 Candles","H̲anoukah: 4 Bougies"},
       {""}, {""},
 #line 35 "strings_fr.gperf"
       {"Horayot","Horayot"},
-      {""},
-#line 120 "strings_fr.gperf"
-      {"Chanukah: 4 Candles","H̲anoukah: 4 Bougies"},
-      {""}, {""}, {""},
-#line 189 "strings_fr.gperf"
+#line 190 "strings_fr.gperf"
       {"Sukkot III (CH''M)","Soukkot III (H̲''M)"},
 #line 119 "strings_fr.gperf"
       {"Chanukah: 3 Candles","H̲anoukah: 3 Bougies"},
@@ -539,47 +542,42 @@ hebcal_lookup_fr (register const char *s
       {"Chagigah","H̲aguigah"},
 #line 118 "strings_fr.gperf"
       {"Chanukah: 2 Candles","H̲anoukah: 2 Bougies"},
-#line 48 "strings_fr.gperf"
-      {"Daf Yomi: %s %d","Daf Yomi: %s %d"},
-      {""},
+      {""}, {""},
 #line 110 "strings_fr.gperf"
       {"Vayikra","Vayikra"},
-      {""}, {""}, {""}, {""}, {""},
-#line 137 "strings_fr.gperf"
-      {"Leil Selichot","Lel Selih̲ot"},
-      {""},
-#line 77 "strings_fr.gperf"
-      {"Ki Teitzei","Ki Tétzé"},
-      {""},
-#line 207 "strings_fr.gperf"
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 208 "strings_fr.gperf"
       {"Yom HaAliyah","Yom ha'Alyah"},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 112 "strings_fr.gperf"
-      {"Vezot Haberakhah","Vezot Haberakhah"},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""},
 #line 34 "strings_fr.gperf"
       {"Avodah Zarah","Avodah Zarah"},
-      {""},
+#line 74 "strings_fr.gperf"
+      {"Ha'Azinu","Ha'Azinou"},
 #line 105 "strings_fr.gperf"
       {"Vayeilech","Vayelekh"},
       {""}, {""}, {""},
 #line 54 "strings_fr.gperf"
       {"yahrtzeit file read error. Skipping line %s","Erreur de lecture du fichier des yahrzeit. Ignore la ligne %s"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 202 "strings_fr.gperf"
+      {""}, {""},
+#line 77 "strings_fr.gperf"
+      {"Ki Teitzei","Ki Tétzé"},
+      {""}, {""}, {""},
+#line 203 "strings_fr.gperf"
       {"Yom HaAtzma'ut","Yom ha'Atzmaout"},
       {""}, {""},
-#line 190 "strings_fr.gperf"
+#line 191 "strings_fr.gperf"
       {"Sukkot IV (CH''M)","Soukkot IV (H̲''M)"},
-      {""}, {""}, {""}, {""}, {""},
-#line 74 "strings_fr.gperf"
-      {"Ha'Azinu","Ha'Azinou"},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""},
+#line 112 "strings_fr.gperf"
+      {"Vezot Haberakhah","Vezot Haberakhah"},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""},
 #line 64 "strings_fr.gperf"
       {"Beha'alotcha","Beha'alotkha"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 193 "strings_fr.gperf"
+#line 194 "strings_fr.gperf"
       {"Sukkot VII (Hoshana Raba)","Soukkot VII (Hochanah Rabbah)"},
       {""}, {""},
 #line 103 "strings_fr.gperf"
@@ -589,25 +587,25 @@ hebcal_lookup_fr (register const char *s
       {"Candle lighting","Allumage des bougies"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""},
-#line 188 "strings_fr.gperf"
+#line 189 "strings_fr.gperf"
       {"Sukkot II (CH''M)","Soukkot II (H̲''M)"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""},
-#line 191 "strings_fr.gperf"
+#line 192 "strings_fr.gperf"
       {"Sukkot V (CH''M)","Soukkot V (H̲''M)"},
       {""}, {""}, {""}, {""}, {""}, {""},
 #line 109 "strings_fr.gperf"
       {"Vayigash","Vayigach"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""},
-#line 203 "strings_fr.gperf"
+#line 204 "strings_fr.gperf"
       {"Yom HaShoah","Yom haShoah"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 192 "strings_fr.gperf"
+#line 193 "strings_fr.gperf"
       {"Sukkot VI (CH''M)","Soukkot VI (H̲''M)"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""},
--- hebcal-4.20.orig/strings_he.c
+++ hebcal-4.20/strings_he.c
@@ -35,7 +35,7 @@
 #line 7 "strings_he.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 189
+#define TOTAL_KEYWORDS 191
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 25
 #define MIN_HASH_VALUE 4
@@ -61,11 +61,11 @@ hash (register const char *str, register
         0, 461, 461, 461, 461, 461,   5, 461, 461,   0,
        45,  40,  35,  20,  15,  10,   0, 461, 461,   0,
       461, 461, 461, 461, 461,  75,  55,  90, 135,  15,
-        5, 110,  45,   0,   0,  80,   5,  40, 140,   5,
+        5, 110,  45,   0,   0,  80,   5,  40, 140,  10,
         5,  35,  70,   0,   0,   5,  10, 165, 461, 125,
        10,   0, 461, 461, 461, 461, 461,  30,  10,  15,
         0,  35,  65,   0,  80,   5,  80,   0,  75,  55,
-       65, 100,   0,   5,   0,   0,  20,   5,   0,  25,
+       65, 100,   0,   5,   0,   0,  20,   5,   0,  60,
       461,  85, 110, 125, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
@@ -118,189 +118,189 @@ hebcal_lookup_he (register const char *s
   static struct event_title wordlist[] =
     {
       {""}, {""}, {""}, {""},
-#line 173 "strings_he.gperf"
+#line 175 "strings_he.gperf"
       {"Sigd","סיגד"},
       {""},
-#line 175 "strings_he.gperf"
+#line 177 "strings_he.gperf"
       {"Sukkot","סוּכּוֹת"},
-#line 187 "strings_he.gperf"
+#line 189 "strings_he.gperf"
       {"Tu B'Av","טוּ בְּאָב"},
-#line 176 "strings_he.gperf"
+#line 178 "strings_he.gperf"
       {"Sukkot I","סוּכּוֹת יוֹם א׳"},
-#line 177 "strings_he.gperf"
+#line 179 "strings_he.gperf"
       {"Sukkot II","סוּכּוֹת יוֹם ב׳"},
-#line 154 "strings_he.gperf"
+#line 156 "strings_he.gperf"
       {"Tevet","טֵבֵת"},
-#line 128 "strings_he.gperf"
+#line 129 "strings_he.gperf"
       {"Pesach","פֶּסַח"},
       {""},
-#line 129 "strings_he.gperf"
-      {"Pesach I","פֶּסַח יוֹם א׳"},
 #line 130 "strings_he.gperf"
+      {"Pesach I","פֶּסַח יוֹם א׳"},
+#line 131 "strings_he.gperf"
       {"Pesach II","פֶּסַח יוֹם ב׳"},
       {""},
 #line 15 "strings_he.gperf"
       {"Sukkah","סוכה"},
-#line 178 "strings_he.gperf"
+#line 180 "strings_he.gperf"
       {"Sukkot II (CH''M)","סוּכּוֹת יוֹם ב׳ (חוֹל הַמוֹעד)"},
-#line 179 "strings_he.gperf"
+#line 181 "strings_he.gperf"
       {"Sukkot III (CH''M)","סוּכּוֹת יוֹם ג׳ (חוֹל הַמוֹעד)"},
       {""},
-#line 189 "strings_he.gperf"
+#line 191 "strings_he.gperf"
       {"Tu B'Shvat","טוּ בִּשְׁבָט"},
       {""},
-#line 131 "strings_he.gperf"
-      {"Pesach II (CH''M)","פֶּסַח יוֹם ב׳ (חוֹל הַמוֹעד)"},
 #line 132 "strings_he.gperf"
+      {"Pesach II (CH''M)","פֶּסַח יוֹם ב׳ (חוֹל הַמוֹעד)"},
+#line 133 "strings_he.gperf"
       {"Pesach III (CH''M)","פֶּסַח יוֹם ג׳ (חוֹל הַמוֹעד)"},
-#line 147 "strings_he.gperf"
+#line 149 "strings_he.gperf"
       {"Elul","אֱלוּל"},
-#line 137 "strings_he.gperf"
-      {"Pesach VII","פֶּסַח יוֹם ז׳"},
 #line 138 "strings_he.gperf"
+      {"Pesach VII","פֶּסַח יוֹם ז׳"},
+#line 139 "strings_he.gperf"
       {"Pesach VIII","פֶּסַח יוֹם ח׳"},
-#line 182 "strings_he.gperf"
+#line 184 "strings_he.gperf"
       {"Sukkot VI (CH''M)","סוּכּוֹת יוֹם ו׳ (חוֹל הַמוֹעד)"},
       {""}, {""},
 #line 25 "strings_he.gperf"
       {"Sotah","סוטה"},
       {""},
-#line 136 "strings_he.gperf"
+#line 137 "strings_he.gperf"
       {"Pesach VI (CH''M)","פֶּסַח יוֹם ו׳ (חוֹל הַמוֹעד)"},
       {""},
-#line 90 "strings_he.gperf"
+#line 91 "strings_he.gperf"
       {"Tzav","צַו"},
-#line 183 "strings_he.gperf"
+#line 185 "strings_he.gperf"
       {"Sukkot VII (Hoshana Raba)","סוּכּוֹת יוֹם ז׳ (הוֹשַׁעְנָא רַבָּה)"},
       {""},
-#line 168 "strings_he.gperf"
+#line 170 "strings_he.gperf"
       {"Shavuot","שָׁבוּעוֹת"},
       {""},
-#line 169 "strings_he.gperf"
+#line 171 "strings_he.gperf"
       {"Shavuot I","שָׁבוּעוֹת יוֹם א׳"},
-#line 170 "strings_he.gperf"
+#line 172 "strings_he.gperf"
       {"Shavuot II","שָׁבוּעוֹת יוֹם ב׳"},
-#line 83 "strings_he.gperf"
+#line 84 "strings_he.gperf"
       {"Shemot","שְׁמוֹת"},
 #line 33 "strings_he.gperf"
       {"Shevuot","שבועות"},
-      {""}, {""},
-#line 62 "strings_he.gperf"
-      {"Eikev","עֵקֶב"},
+      {""}, {""}, {""},
 #line 32 "strings_he.gperf"
       {"Makkot","מכות"},
-#line 79 "strings_he.gperf"
+#line 80 "strings_he.gperf"
       {"Pekudei","פְקוּדֵי"},
       {""}, {""},
 #line 46 "strings_he.gperf"
       {"Midot","מדות"},
-#line 74 "strings_he.gperf"
+#line 75 "strings_he.gperf"
       {"Miketz","מִקֵּץ"},
 #line 10 "strings_he.gperf"
       {"Shabbat","שבת"},
-#line 49 "strings_he.gperf"
+#line 50 "strings_he.gperf"
       {"Parashat","פרשת"},
       {""},
-#line 70 "strings_he.gperf"
+#line 71 "strings_he.gperf"
       {"Lech-Lecha","לֶךְ־לְךָ"},
       {""},
-#line 58 "strings_he.gperf"
+#line 59 "strings_he.gperf"
       {"Bo","בֹּא"},
-#line 172 "strings_he.gperf"
+#line 174 "strings_he.gperf"
       {"Shushan Purim","שׁוּשָׁן פּוּרִים"},
       {""},
-#line 91 "strings_he.gperf"
+#line 92 "strings_he.gperf"
       {"Vaera","וָאֵרָא"},
 #line 43 "strings_he.gperf"
       {"Meilah","מעילה"},
 #line 41 "strings_he.gperf"
       {"Temurah","תמורה"},
-#line 166 "strings_he.gperf"
+#line 168 "strings_he.gperf"
       {"Shabbat Shuva","שַׁבָּת שׁוּבָה"},
       {""},
-#line 164 "strings_he.gperf"
+#line 166 "strings_he.gperf"
       {"Shabbat Rosh Chodesh","שבת ראש חודש"},
-#line 186 "strings_he.gperf"
+#line 188 "strings_he.gperf"
       {"Tish'a B'Av","תִּשְׁעָה בְּאָב"},
-#line 73 "strings_he.gperf"
+#line 74 "strings_he.gperf"
       {"Metzora","מְּצֹרָע"},
 #line 12 "strings_he.gperf"
       {"Pesachim","פסחים"},
       {""},
-#line 72 "strings_he.gperf"
+#line 73 "strings_he.gperf"
       {"Matot","מַּטּוֹת"},
       {""},
-#line 87 "strings_he.gperf"
+#line 88 "strings_he.gperf"
       {"Terumah","תְּרוּמָה"},
 #line 36 "strings_he.gperf"
       {"Zevachim","זבחים"},
-#line 167 "strings_he.gperf"
+#line 169 "strings_he.gperf"
       {"Shabbat Zachor","שַׁבָּת זָכוֹר"},
-#line 139 "strings_he.gperf"
+#line 140 "strings_he.gperf"
       {"Purim","פּוּרִים"},
       {""},
-#line 145 "strings_he.gperf"
+#line 147 "strings_he.gperf"
       {"Av","אָב"},
-#line 174 "strings_he.gperf"
+#line 176 "strings_he.gperf"
       {"Simchat Torah","שִׂמְחַת תּוֹרָה"},
       {""},
-#line 162 "strings_he.gperf"
-      {"Shabbat Nachamu","שַׁבָּת נַחֲמוּ"},
-#line 89 "strings_he.gperf"
+#line 63 "strings_he.gperf"
+      {"Eikev","עֵקֶב"},
+#line 90 "strings_he.gperf"
       {"Toldot","תּוֹלְדוֹת"},
-#line 80 "strings_he.gperf"
+#line 81 "strings_he.gperf"
       {"Pinchas","פִּינְחָס"},
 #line 9 "strings_he.gperf"
       {"Berachot","ברכות"},
-      {""}, {""},
-#line 69 "strings_he.gperf"
+      {""},
+#line 164 "strings_he.gperf"
+      {"Shabbat Nachamu","שַׁבָּת נַחֲמוּ"},
+#line 70 "strings_he.gperf"
       {"Korach","קוֹרַח"},
-#line 134 "strings_he.gperf"
+#line 135 "strings_he.gperf"
       {"Pesach Sheni","פֶּסַח שני"},
       {""}, {""},
-#line 148 "strings_he.gperf"
+#line 150 "strings_he.gperf"
       {"Iyyar","אִיָיר"},
       {""},
 #line 42 "strings_he.gperf"
       {"Keritot","כריתות"},
-#line 163 "strings_he.gperf"
+#line 165 "strings_he.gperf"
       {"Shabbat Parah","שַׁבָּת פּרה"},
-#line 57 "strings_he.gperf"
+#line 58 "strings_he.gperf"
       {"Beshalach","בְּשַׁלַּח"},
 #line 45 "strings_he.gperf"
       {"Tamid","תמיד"},
-#line 165 "strings_he.gperf"
+#line 167 "strings_he.gperf"
       {"Shabbat Shekalim","שַׁבָּת שְׁקָלִים"},
-#line 66 "strings_he.gperf"
+#line 67 "strings_he.gperf"
       {"Ki Tavo","כִּי־תָבוֹא"},
 #line 39 "strings_he.gperf"
       {"Bechorot","בכורות"},
       {""},
-#line 188 "strings_he.gperf"
+#line 190 "strings_he.gperf"
       {"Tu BiShvat","טוּ בִּשְׁבָט"},
-#line 96 "strings_he.gperf"
+#line 97 "strings_he.gperf"
       {"Vayera","וַיֵּרָא"},
-#line 94 "strings_he.gperf"
+#line 95 "strings_he.gperf"
       {"Vayechi","וַיְחִי"},
-#line 56 "strings_he.gperf"
+#line 57 "strings_he.gperf"
       {"Bereshit","בְּרֵאשִׁית"},
       {""},
-#line 152 "strings_he.gperf"
+#line 154 "strings_he.gperf"
       {"Sivan","סִיוָן"},
 #line 11 "strings_he.gperf"
       {"Eruvin","עירובין"},
       {""},
 #line 13 "strings_he.gperf"
       {"Shekalim","שקלים"},
-#line 142 "strings_he.gperf"
+#line 144 "strings_he.gperf"
       {"Adar","אַדָר"},
-#line 53 "strings_he.gperf"
+#line 54 "strings_he.gperf"
       {"Bechukotai","בְּחֻקֹּתַי"},
-#line 60 "strings_he.gperf"
+#line 61 "strings_he.gperf"
       {"Chukat","חֻקַּת"},
-#line 85 "strings_he.gperf"
+#line 86 "strings_he.gperf"
       {"Shoftim","שׁוֹפְטִים"},
-#line 98 "strings_he.gperf"
+#line 99 "strings_he.gperf"
       {"Vayetzei","וַיֵּצֵא"},
       {""},
 #line 30 "strings_he.gperf"
@@ -309,125 +309,125 @@ hebcal_lookup_he (register const char *s
       {"Taanit","תענית"},
 #line 40 "strings_he.gperf"
       {"Arachin","ערכין"},
-#line 88 "strings_he.gperf"
+#line 89 "strings_he.gperf"
       {"Tetzaveh","תְּצַוֶּה"},
-#line 63 "strings_he.gperf"
+#line 64 "strings_he.gperf"
       {"Emor","אֱמוֹר"},
       {""},
-#line 123 "strings_he.gperf"
+#line 124 "strings_he.gperf"
       {"Erev Tish'a B'Av","עֶרֶב תִּשְׁעָה בְּאָב"},
 #line 22 "strings_he.gperf"
       {"Ketubot","כתובות"},
-#line 97 "strings_he.gperf"
+#line 98 "strings_he.gperf"
       {"Vayeshev","וַיֵּשֶׁב"},
-#line 75 "strings_he.gperf"
+#line 76 "strings_he.gperf"
       {"Mishpatim","מִּשְׁפָּטִים"},
-#line 71 "strings_he.gperf"
+#line 72 "strings_he.gperf"
       {"Masei","מַסְעֵי"},
-#line 151 "strings_he.gperf"
+#line 153 "strings_he.gperf"
       {"Sh'vat","שְׁבָט"},
-#line 82 "strings_he.gperf"
+#line 83 "strings_he.gperf"
       {"Sh'lach","שְׁלַח־לְךָ"},
       {""}, {""},
-#line 92 "strings_he.gperf"
+#line 93 "strings_he.gperf"
       {"Vaetchanan","וָאֶתְחַנַּן"},
-#line 143 "strings_he.gperf"
+#line 145 "strings_he.gperf"
       {"Adar I","אַדָר א׳"},
-#line 144 "strings_he.gperf"
+#line 146 "strings_he.gperf"
       {"Adar II","אַדָר ב׳"},
 #line 37 "strings_he.gperf"
       {"Menachot","מנחות"},
       {""},
 #line 19 "strings_he.gperf"
       {"Moed Katan","מועד קטן"},
-#line 181 "strings_he.gperf"
+#line 183 "strings_he.gperf"
       {"Sukkot V (CH''M)","סוּכּוֹת יוֹם ה׳ (חוֹל הַמוֹעד)"},
-#line 119 "strings_he.gperf"
+#line 120 "strings_he.gperf"
       {"Erev Rosh Hashana","עֶרֶב רֹאשׁ הַשָּׁנָה"},
       {""}, {""},
-#line 55 "strings_he.gperf"
+#line 56 "strings_he.gperf"
       {"Behar","בְּהַר"},
-#line 135 "strings_he.gperf"
+#line 136 "strings_he.gperf"
       {"Pesach V (CH''M)","פֶּסַח יוֹם ה׳ (חוֹל הַמוֹעד)"},
-#line 61 "strings_he.gperf"
+#line 62 "strings_he.gperf"
       {"Devarim","דְּבָרִים"},
-#line 125 "strings_he.gperf"
+#line 126 "strings_he.gperf"
       {"Havdalah","הַבדָלָה"},
       {""},
-#line 76 "strings_he.gperf"
+#line 77 "strings_he.gperf"
       {"Nasso","נָשׂא"},
       {""},
 #line 23 "strings_he.gperf"
       {"Nedarim","נדרים"},
-#line 190 "strings_he.gperf"
+#line 192 "strings_he.gperf"
       {"Tzom Gedaliah","צוֹם גְּדַלְיָה"},
       {""},
-#line 103 "strings_he.gperf"
+#line 104 "strings_he.gperf"
       {"Yitro","יִתְרוֹ"},
-#line 149 "strings_he.gperf"
+#line 151 "strings_he.gperf"
       {"Kislev","כִּסְלֵו"},
-#line 159 "strings_he.gperf"
+#line 161 "strings_he.gperf"
       {"Shabbat HaChodesh","שַׁבָּת הַחֹדֶשׁ"},
-#line 52 "strings_he.gperf"
+#line 53 "strings_he.gperf"
       {"Bamidbar","בְּמִדְבַּר"},
       {""},
-#line 101 "strings_he.gperf"
+#line 102 "strings_he.gperf"
       {"Vayishlach","וַיִּשְׁלַח"},
 #line 47 "strings_he.gperf"
       {"Niddah","נדה"},
 #line 38 "strings_he.gperf"
       {"Chullin","חולין"},
       {""}, {""},
-#line 118 "strings_he.gperf"
+#line 119 "strings_he.gperf"
       {"Erev Purim","עֶרֶב פּוּרִים"},
-#line 84 "strings_he.gperf"
+#line 85 "strings_he.gperf"
       {"Shmini","שְּׁמִינִי"},
 #line 35 "strings_he.gperf"
       {"Horayot","הוריות"},
-#line 65 "strings_he.gperf"
+#line 66 "strings_he.gperf"
       {"Kedoshim","קְדשִׁים"},
       {""},
-#line 124 "strings_he.gperf"
+#line 125 "strings_he.gperf"
       {"Erev Yom Kippur","עֶרֶב יוֹם כִּפּוּר"},
       {""},
-#line 68 "strings_he.gperf"
+#line 69 "strings_he.gperf"
       {"Ki Tisa","כִּי תִשָּׂא"},
       {""}, {""},
-#line 160 "strings_he.gperf"
+#line 162 "strings_he.gperf"
       {"Shabbat HaGadol","שַׁבָּת הַגָּדוֹל"},
-#line 117 "strings_he.gperf"
+#line 118 "strings_he.gperf"
       {"Erev Pesach","עֶרֶב פֶּסַח"},
-#line 155 "strings_he.gperf"
+#line 157 "strings_he.gperf"
       {"Rosh Hashana","רֹאשׁ הַשָּׁנָה"},
-#line 121 "strings_he.gperf"
+#line 122 "strings_he.gperf"
       {"Erev Simchat Torah","עֶרֶב שִׂמְחַת תּוֹרָה"},
-#line 156 "strings_he.gperf"
+#line 158 "strings_he.gperf"
       {"Rosh Hashana I","רֹאשׁ הַשָּׁנָה יוֹם א׳"},
-#line 157 "strings_he.gperf"
+#line 159 "strings_he.gperf"
       {"Rosh Hashana II","רֹאשׁ הַשָּׁנָה יוֹם ב׳"},
-#line 122 "strings_he.gperf"
+#line 123 "strings_he.gperf"
       {"Erev Sukkot","עֶרֶב סוּכּוֹת"},
-#line 100 "strings_he.gperf"
+#line 101 "strings_he.gperf"
       {"Vayikra","וַיִּקְרָא"},
       {""}, {""},
-#line 78 "strings_he.gperf"
+#line 79 "strings_he.gperf"
       {"Noach","נֹחַ"},
-#line 140 "strings_he.gperf"
+#line 141 "strings_he.gperf"
       {"Purim Katan","פּוּרִים קָטָן"},
-#line 180 "strings_he.gperf"
+#line 182 "strings_he.gperf"
       {"Sukkot IV (CH''M)","סוּכּוֹת יוֹם ד׳ (חוֹל הַמוֹעד)"},
 #line 18 "strings_he.gperf"
       {"Megillah","מגילה"},
 #line 14 "strings_he.gperf"
       {"Yoma","יומא"},
-#line 153 "strings_he.gperf"
+#line 155 "strings_he.gperf"
       {"Tamuz","תָּמוּז"},
-#line 102 "strings_he.gperf"
+#line 103 "strings_he.gperf"
       {"Vezot Haberakhah","וְזֹאת הַבְּרָכָה"},
-#line 133 "strings_he.gperf"
+#line 134 "strings_he.gperf"
       {"Pesach IV (CH''M)","פֶּסַח יוֹם ד׳ (חוֹל הַמוֹעד)"},
       {""}, {""},
-#line 81 "strings_he.gperf"
+#line 82 "strings_he.gperf"
       {"Re'eh","רְאֵה"},
       {""},
 #line 16 "strings_he.gperf"
@@ -435,140 +435,142 @@ hebcal_lookup_he (register const char *s
       {""},
 #line 27 "strings_he.gperf"
       {"Kiddushin","קידושין"},
-#line 195 "strings_he.gperf"
+#line 197 "strings_he.gperf"
       {"Yom Kippur","יוֹם כִּפּוּר"},
-#line 86 "strings_he.gperf"
+#line 87 "strings_he.gperf"
       {"Tazria","תַזְרִיעַ"},
 #line 21 "strings_he.gperf"
       {"Yevamot","יבמות"},
       {""}, {""}, {""}, {""}, {""},
-#line 146 "strings_he.gperf"
+#line 148 "strings_he.gperf"
       {"Cheshvan","חֶשְׁוָן"},
-#line 95 "strings_he.gperf"
+#line 96 "strings_he.gperf"
       {"Vayeilech","וַיֵּלֶךְ"},
       {""}, {""}, {""},
-#line 106 "strings_he.gperf"
+#line 107 "strings_he.gperf"
       {"Chanukah","חֲנוּכָּה"},
       {""},
-#line 51 "strings_he.gperf"
+#line 52 "strings_he.gperf"
       {"Balak","בָּלָק"},
       {""}, {""}, {""}, {""},
 #line 28 "strings_he.gperf"
       {"Baba Kamma","בבא קמא"},
       {""},
-#line 115 "strings_he.gperf"
+#line 116 "strings_he.gperf"
       {"Chanukah: 8th Day","חֲנוּכָּה: יוֹם ח׳"},
-#line 107 "strings_he.gperf"
+#line 108 "strings_he.gperf"
       {"Chanukah: 1 Candle","חֲנוּכָּה: א׳ נֵר"},
-#line 114 "strings_he.gperf"
+#line 115 "strings_he.gperf"
       {"Chanukah: 8 Candles","חֲנוּכָּה: ח׳ נֵרוֹת"},
       {""}, {""},
-#line 161 "strings_he.gperf"
+#line 163 "strings_he.gperf"
       {"Shabbat Machar Chodesh","שבת מחר חודש"},
-      {""},
-#line 158 "strings_he.gperf"
+#line 49 "strings_he.gperf"
+      {"Daf Yomi","דף יומי"},
+#line 160 "strings_he.gperf"
       {"Shabbat Chazon","שַׁבָּת חֲזוֹן"},
-#line 126 "strings_he.gperf"
+#line 127 "strings_he.gperf"
       {"Lag BaOmer","ל״ג בְּעוֹמֶר"},
       {""}, {""}, {""},
-#line 113 "strings_he.gperf"
+#line 114 "strings_he.gperf"
       {"Chanukah: 7 Candles","חֲנוּכָּה: ז׳ נֵרוֹת"},
 #line 48 "strings_he.gperf"
       {"Daf Yomi: %s %d","דף יומי: %s %d"},
 #line 44 "strings_he.gperf"
       {"Kinnim","קינים"},
       {""},
-#line 77 "strings_he.gperf"
+#line 78 "strings_he.gperf"
       {"Nitzavim","נִצָּבִים"},
-#line 112 "strings_he.gperf"
+#line 113 "strings_he.gperf"
       {"Chanukah: 6 Candles","חֲנוּכָּה: ו׳ נֵרוֹת"},
 #line 26 "strings_he.gperf"
       {"Gitin","גיטין"},
-#line 59 "strings_he.gperf"
+#line 60 "strings_he.gperf"
       {"Chayei Sara","חַיֵּי שָֹרָה"},
-#line 120 "strings_he.gperf"
-      {"Erev Shavuot","עֶרֶב שָׁבוּעוֹת"},
+#line 143 "strings_he.gperf"
+      {"Rosh Chodesh","רֹאשׁ חודש"},
       {""},
-#line 111 "strings_he.gperf"
+#line 112 "strings_he.gperf"
       {"Chanukah: 5 Candles","חֲנוּכָּה: ה׳ נֵרוֹת"},
-#line 141 "strings_he.gperf"
+#line 142 "strings_he.gperf"
       {"Rosh Chodesh %s","רֹאשׁ חודש %s"},
       {""}, {""},
-#line 104 "strings_he.gperf"
+#line 105 "strings_he.gperf"
       {"Asara B'Tevet","עֲשָׂרָה בְּטֵבֵת"},
 #line 31 "strings_he.gperf"
       {"Sanhedrin","סנהדרין"},
-#line 150 "strings_he.gperf"
+#line 152 "strings_he.gperf"
       {"Nisan","נִיסָן"},
       {""},
 #line 34 "strings_he.gperf"
       {"Avodah Zarah","עבודה זרה"},
       {""},
-#line 185 "strings_he.gperf"
+#line 187 "strings_he.gperf"
       {"Ta'anit Esther","תַּעֲנִית אֶסְתֵּר"},
       {""}, {""}, {""},
-#line 93 "strings_he.gperf"
+#line 94 "strings_he.gperf"
       {"Vayakhel","וַיַּקְהֵל"},
-#line 110 "strings_he.gperf"
+#line 111 "strings_he.gperf"
       {"Chanukah: 4 Candles","חֲנוּכָּה: ד׳ נֵרוֹת"},
 #line 24 "strings_he.gperf"
       {"Nazir","נזיר"},
       {""}, {""}, {""},
-#line 109 "strings_he.gperf"
+#line 110 "strings_he.gperf"
       {"Chanukah: 3 Candles","חֲנוּכָּה: ג׳ נֵרוֹת"},
       {""},
-#line 196 "strings_he.gperf"
+#line 198 "strings_he.gperf"
       {"Yom Yerushalayim","יוֹם יְרוּשָׁלַיִם"},
       {""},
-#line 99 "strings_he.gperf"
+#line 100 "strings_he.gperf"
       {"Vayigash","וַיִּגַּשׁ"},
-#line 108 "strings_he.gperf"
+#line 109 "strings_he.gperf"
       {"Chanukah: 2 Candles","חֲנוּכָּה: ב׳ נֵרוֹת"},
       {""}, {""}, {""}, {""}, {""},
-#line 50 "strings_he.gperf"
+#line 51 "strings_he.gperf"
       {"Achrei Mot","אַחֲרֵי מוֹת"},
 #line 29 "strings_he.gperf"
       {"Baba Metzia","בבא מציעא"},
-      {""},
-#line 194 "strings_he.gperf"
+#line 121 "strings_he.gperf"
+      {"Erev Shavuot","עֶרֶב שָׁבוּעוֹת"},
+#line 196 "strings_he.gperf"
       {"Yom HaZikaron","יוֹם הַזִּכָּרוֹן"},
       {""}, {""}, {""}, {""},
-#line 127 "strings_he.gperf"
+#line 128 "strings_he.gperf"
       {"Leil Selichot","סליחות"},
       {""}, {""}, {""}, {""}, {""},
-#line 171 "strings_he.gperf"
+#line 173 "strings_he.gperf"
       {"Shmini Atzeret","שְׁמִינִי עֲצֶרֶת"},
       {""}, {""}, {""},
 #line 20 "strings_he.gperf"
       {"Chagigah","חגיגה"},
       {""}, {""}, {""}, {""},
-#line 64 "strings_he.gperf"
+#line 65 "strings_he.gperf"
       {"Ha'Azinu","הַאֲזִינוּ"},
       {""}, {""},
-#line 116 "strings_he.gperf"
+#line 117 "strings_he.gperf"
       {"Days of the Omer","עוֹמֶר"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 67 "strings_he.gperf"
+#line 68 "strings_he.gperf"
       {"Ki Teitzei","כִּי־תֵצֵא"},
-#line 184 "strings_he.gperf"
+#line 186 "strings_he.gperf"
       {"Ta'anit Bechorot","תַּעֲנִית בְּכוֹרוֹת"},
-#line 54 "strings_he.gperf"
+#line 55 "strings_he.gperf"
       {"Beha'alotcha","בְּהַעֲלֹתְךָ"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 193 "strings_he.gperf"
+#line 195 "strings_he.gperf"
       {"Yom HaShoah","יוֹם הַשּׁוֹאָה"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 191 "strings_he.gperf"
+#line 193 "strings_he.gperf"
       {"Tzom Tammuz","צוֹם תָּמוּז"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 192 "strings_he.gperf"
+#line 194 "strings_he.gperf"
       {"Yom HaAtzma'ut","יוֹם הָעַצְמָאוּת"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 197 "strings_he.gperf"
+#line 199 "strings_he.gperf"
       {"Yom HaAliyah","יוֹם העלייה"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -580,7 +582,7 @@ hebcal_lookup_he (register const char *s
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""},
-#line 105 "strings_he.gperf"
+#line 106 "strings_he.gperf"
       {"Candle lighting","הדלקת נרות"}
     };
 
--- hebcal-4.20.orig/strings_hu.c
+++ hebcal-4.20/strings_hu.c
@@ -1,5 +1,5 @@
-/* C code produced by gperf version 3.0.3 */
-/* Command-line: /Library/Developer/CommandLineTools/usr/bin/gperf strings_hu.gperf  */
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf strings_hu.gperf  */
 /* Computed positions: -k'1,3,5,8-9,11' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -26,7 +26,7 @@
       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
 /* The character set is not based on ISO-646.  */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
 #line 4 "strings_hu.gperf"
@@ -35,7 +35,7 @@ error "gperf generated tables don't work
 #line 7 "strings_hu.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 199
+#define TOTAL_KEYWORDS 201
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 58
 #define MIN_HASH_VALUE 4
@@ -50,9 +50,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register size_t len)
 {
   static unsigned short asso_values[] =
     {
@@ -60,15 +58,15 @@ hash (str, len)
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
       466, 466,   0,   0, 466, 466, 466,   0, 466,  55,
-      100, 466, 466, 466, 466, 466,  45, 466, 466,   5,
+      100, 466, 466, 466, 466, 466,  75, 466, 466,   5,
        40,  35,  30,  20,  15,  10,   5, 466, 466,   0,
-      466, 466, 466, 466, 466, 150,   5, 105, 105,   0,
-       10,  35, 115,  20,  40,  35,  35,  80,  20,  30,
-        0,  15, 170,  40,   5,  35,  95,   0, 466, 115,
-      105,  10, 466, 466, 466, 466, 466,  10,   5,  35,
+      466, 466, 466, 466, 466, 150,   5, 105,  70,   0,
+       10,  35,  85,  20,  40,  35,   5,  80,  20,  30,
+        0,  15, 150,  40,   5,  35,  95,   0, 466, 115,
+      115,  10, 466, 466, 466, 466, 466,  10,   5,  35,
         5,   5,  50,   0, 105,  10,  55,  90,  75,  10,
         0,  25,  70,   0,   0,   0,   0,   0,   5,  35,
-      466, 110, 150, 165, 466, 466, 466, 466, 466, 466,
+      466, 110, 185, 165, 466, 466, 466, 466, 466, 466,
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
       466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
@@ -115,42 +113,40 @@ hash (str, len)
 }
 
 struct event_title *
-hebcal_lookup_hu (str, len)
-     register const char *str;
-     register unsigned int len;
+hebcal_lookup_hu (register const char *str, register size_t len)
 {
   static struct event_title wordlist[] =
     {
       {""}, {""}, {""}, {""},
-#line 157 "strings_hu.gperf"
+#line 159 "strings_hu.gperf"
       {"Elul","Elul"},
-#line 149 "strings_hu.gperf"
+#line 150 "strings_hu.gperf"
       {"Purim","Purim"},
       {""},
-#line 68 "strings_hu.gperf"
+#line 69 "strings_hu.gperf"
       {"Bo","Bo"},
-#line 59 "strings_hu.gperf"
+#line 60 "strings_hu.gperf"
       {"Parashat","Párását"},
       {""}, {""},
-#line 138 "strings_hu.gperf"
+#line 139 "strings_hu.gperf"
       {"Pesach","Peszách"},
-#line 97 "strings_hu.gperf"
+#line 98 "strings_hu.gperf"
       {"Terumah","Trumá"},
-#line 66 "strings_hu.gperf"
+#line 67 "strings_hu.gperf"
       {"Bereshit","Bérésit"},
       {""},
-#line 164 "strings_hu.gperf"
+#line 166 "strings_hu.gperf"
       {"Tevet","Tévét"},
       {""},
-#line 90 "strings_hu.gperf"
+#line 91 "strings_hu.gperf"
       {"Pinchas","Pinchász"},
 #line 9 "strings_hu.gperf"
       {"Berachot","Bráchot"},
-#line 100 "strings_hu.gperf"
+#line 101 "strings_hu.gperf"
       {"Tzav","Cáv"},
 #line 30 "strings_hu.gperf"
       {"Baba Batra","Bává Bátrá"},
-#line 150 "strings_hu.gperf"
+#line 151 "strings_hu.gperf"
       {"Purim Katan","Purim Kátán"},
 #line 41 "strings_hu.gperf"
       {"Temurah","Tmurá"},
@@ -160,47 +156,47 @@ hebcal_lookup_hu (str, len)
 #line 45 "strings_hu.gperf"
       {"Tamid","Támid"},
       {""}, {""},
-#line 62 "strings_hu.gperf"
+#line 63 "strings_hu.gperf"
       {"Bamidbar","Bámidbár"},
-#line 73 "strings_hu.gperf"
+#line 74 "strings_hu.gperf"
       {"Emor","Emor"},
 #line 28 "strings_hu.gperf"
       {"Baba Kamma","Bává Kámá"},
       {""},
 #line 23 "strings_hu.gperf"
       {"Nedarim","Nödárim"},
-#line 139 "strings_hu.gperf"
+#line 140 "strings_hu.gperf"
       {"Pesach I","Peszách I"},
       {""}, {""},
 #line 47 "strings_hu.gperf"
       {"Niddah","Nidá"},
       {""},
-#line 50 "strings_hu.gperf"
+#line 51 "strings_hu.gperf"
       {"Error in input file.  Skipping line %s","Hiba a beviteli fájlban. Sor kihagyása %s"},
       {""},
-#line 134 "strings_hu.gperf"
+#line 135 "strings_hu.gperf"
       {"Erev Yom Kippur","Erev Jom kipur"},
-#line 133 "strings_hu.gperf"
+#line 134 "strings_hu.gperf"
       {"Erev Tish'a B'Av","Erev Tisá böÁv"},
 #line 42 "strings_hu.gperf"
       {"Keritot","Kritot"},
-#line 87 "strings_hu.gperf"
+#line 88 "strings_hu.gperf"
       {"Nitzavim","Nicávim"},
-#line 183 "strings_hu.gperf"
+#line 185 "strings_hu.gperf"
       {"Sigd","Sigd"},
-#line 88 "strings_hu.gperf"
+#line 89 "strings_hu.gperf"
       {"Noach","Noách"},
-#line 79 "strings_hu.gperf"
+#line 80 "strings_hu.gperf"
       {"Korach","Korách"},
-#line 76 "strings_hu.gperf"
+#line 77 "strings_hu.gperf"
       {"Ki Tavo","Ki Távó"},
-#line 131 "strings_hu.gperf"
+#line 132 "strings_hu.gperf"
       {"Erev Simchat Torah","Erev Szimchát Tóra"},
       {""},
-#line 160 "strings_hu.gperf"
+#line 162 "strings_hu.gperf"
       {"Nisan","Niszán"},
       {""},
-#line 55 "strings_hu.gperf"
+#line 56 "strings_hu.gperf"
       {"Error in yahrtzeit file.  Skipping line %s","Hiba a jorcájt fájlban. Sor kihagyása %s"},
       {""}, {""},
 #line 25 "strings_hu.gperf"
@@ -208,421 +204,423 @@ hebcal_lookup_hu (str, len)
       {""},
 #line 33 "strings_hu.gperf"
       {"Shevuot","Sávuot"},
-#line 75 "strings_hu.gperf"
+#line 76 "strings_hu.gperf"
       {"Kedoshim","Ködosim"},
       {""},
-#line 63 "strings_hu.gperf"
+#line 64 "strings_hu.gperf"
       {"Bechukotai","Bechukotáj"},
 #line 11 "strings_hu.gperf"
       {"Eruvin","Éruvin"},
-#line 178 "strings_hu.gperf"
+#line 180 "strings_hu.gperf"
       {"Shavuot","Sávuot"},
-#line 200 "strings_hu.gperf"
+#line 202 "strings_hu.gperf"
       {"Tzom Gedaliah","Com Gedáljá"},
-#line 67 "strings_hu.gperf"
+#line 68 "strings_hu.gperf"
       {"Beshalach","Bösálách"},
 #line 26 "strings_hu.gperf"
       {"Gitin","Gitin"},
       {""},
-#line 144 "strings_hu.gperf"
+#line 145 "strings_hu.gperf"
       {"Pesach Sheni","Peszách séni"},
 #line 13 "strings_hu.gperf"
       {"Shekalim","Skálim"},
       {""},
-#line 128 "strings_hu.gperf"
+#line 129 "strings_hu.gperf"
       {"Erev Purim","Erev Purim"},
       {""},
-#line 95 "strings_hu.gperf"
+#line 96 "strings_hu.gperf"
       {"Shoftim","Softim"},
       {""},
-#line 140 "strings_hu.gperf"
+#line 141 "strings_hu.gperf"
       {"Pesach II","Peszách II"},
-#line 162 "strings_hu.gperf"
+#line 164 "strings_hu.gperf"
       {"Sivan","Sziván"},
 #line 17 "strings_hu.gperf"
       {"Taanit","Táánit"},
 #line 22 "strings_hu.gperf"
       {"Ketubot","Kötubot"},
-#line 182 "strings_hu.gperf"
+#line 184 "strings_hu.gperf"
       {"Shushan Purim","Susán purim"},
       {""},
-#line 198 "strings_hu.gperf"
+#line 200 "strings_hu.gperf"
       {"Tu BiShvat","Tu biSvát"},
-#line 94 "strings_hu.gperf"
+#line 95 "strings_hu.gperf"
       {"Shmini","Smini"},
-      {""},
-#line 142 "strings_hu.gperf"
+#line 72 "strings_hu.gperf"
+      {"Devarim","Dvárim"},
+#line 143 "strings_hu.gperf"
       {"Pesach III (CH''M)","Peszách III (CH''M)"},
       {""},
-#line 82 "strings_hu.gperf"
+#line 83 "strings_hu.gperf"
       {"Matot","Mátot"},
       {""},
-#line 130 "strings_hu.gperf"
+#line 131 "strings_hu.gperf"
       {"Erev Shavuot","Erev Sávuot"},
       {""},
 #line 27 "strings_hu.gperf"
       {"Kiddushin","Kidusin"},
 #line 46 "strings_hu.gperf"
       {"Midot","Midot"},
-#line 159 "strings_hu.gperf"
+#line 161 "strings_hu.gperf"
       {"Kislev","Kiszlév"},
 #line 10 "strings_hu.gperf"
       {"Shabbat","Sábát"},
 #line 37 "strings_hu.gperf"
       {"Menachot","Mönáchot"},
       {""},
-#line 86 "strings_hu.gperf"
+#line 87 "strings_hu.gperf"
       {"Nasso","Nászo"},
 #line 44 "strings_hu.gperf"
       {"Kinnim","Kinim"},
-#line 78 "strings_hu.gperf"
+#line 79 "strings_hu.gperf"
       {"Ki Tisa","Ki Tiszá"},
-#line 51 "strings_hu.gperf"
+#line 52 "strings_hu.gperf"
       {"Numeric hebrew month in input file.  Skipping line %s","Numerikus héber hónap a beviteli fájlban. Sor kihagyása %s"},
-#line 85 "strings_hu.gperf"
+#line 86 "strings_hu.gperf"
       {"Mishpatim","Mispátim"},
 #line 19 "strings_hu.gperf"
       {"Moed Katan","Moéd Kátán"},
 #line 43 "strings_hu.gperf"
       {"Meilah","Möilá"},
-#line 89 "strings_hu.gperf"
+#line 90 "strings_hu.gperf"
       {"Pekudei","Pekudé"},
-#line 176 "strings_hu.gperf"
+#line 178 "strings_hu.gperf"
       {"Shabbat Shuva","Sábát Suvá"},
-#line 179 "strings_hu.gperf"
+#line 181 "strings_hu.gperf"
       {"Shavuot I","Sávuot I"},
-#line 180 "strings_hu.gperf"
+#line 182 "strings_hu.gperf"
       {"Shavuot II","Sávuot II"},
-#line 161 "strings_hu.gperf"
+#line 163 "strings_hu.gperf"
       {"Sh'vat","Svát"},
-#line 92 "strings_hu.gperf"
+#line 93 "strings_hu.gperf"
       {"Sh'lach","Slách"},
-#line 184 "strings_hu.gperf"
+#line 186 "strings_hu.gperf"
       {"Simchat Torah","Szimchát Tóra"},
-#line 195 "strings_hu.gperf"
+#line 197 "strings_hu.gperf"
       {"Ta'anit Esther","Táánit Eszter"},
-#line 101 "strings_hu.gperf"
+#line 102 "strings_hu.gperf"
       {"Vaera","Vaéra"},
-#line 175 "strings_hu.gperf"
+#line 177 "strings_hu.gperf"
       {"Shabbat Shekalim","Sábát Skálim"},
-#line 197 "strings_hu.gperf"
+#line 199 "strings_hu.gperf"
       {"Tu B'Av","Tu böÁv"},
-#line 173 "strings_hu.gperf"
+#line 175 "strings_hu.gperf"
       {"Shabbat Parah","Sábát Párá"},
       {""},
-#line 65 "strings_hu.gperf"
+#line 66 "strings_hu.gperf"
       {"Behar","Böhár"},
-#line 70 "strings_hu.gperf"
-      {"Chukat","Chukát"},
 #line 71 "strings_hu.gperf"
-      {"Devarim","Dvárim"},
+      {"Chukat","Chukát"},
+#line 130 "strings_hu.gperf"
+      {"Erev Rosh Hashana","Erev Ros hásáná"},
 #line 39 "strings_hu.gperf"
       {"Bechorot","Böchorot"},
       {""},
-#line 102 "strings_hu.gperf"
+#line 103 "strings_hu.gperf"
       {"Vaetchanan","Váetchánán"},
-#line 93 "strings_hu.gperf"
+#line 94 "strings_hu.gperf"
       {"Shemot","Smot"},
 #line 38 "strings_hu.gperf"
       {"Chullin","Chulin"},
-#line 98 "strings_hu.gperf"
+#line 99 "strings_hu.gperf"
       {"Tetzaveh","Tecáve"},
       {""},
-#line 199 "strings_hu.gperf"
+#line 201 "strings_hu.gperf"
       {"Tu B'Shvat","Tu biSvát"},
-#line 127 "strings_hu.gperf"
+#line 128 "strings_hu.gperf"
       {"Erev Pesach","Erev Peszách"},
 #line 21 "strings_hu.gperf"
       {"Yevamot","Jövámot"},
-#line 156 "strings_hu.gperf"
+#line 158 "strings_hu.gperf"
       {"Cheshvan","Chesván"},
 #line 14 "strings_hu.gperf"
       {"Yoma","Jomá"},
-#line 72 "strings_hu.gperf"
+#line 73 "strings_hu.gperf"
       {"Eikev","Ékev"},
-      {""}, {""},
-#line 36 "strings_hu.gperf"
-      {"Zevachim","Zváchim"},
+      {""}, {""}, {""},
 #line 31 "strings_hu.gperf"
       {"Sanhedrin","Szánhedrin"},
-#line 158 "strings_hu.gperf"
+#line 160 "strings_hu.gperf"
       {"Iyyar","Ijár"},
       {""}, {""},
-#line 56 "strings_hu.gperf"
+#line 57 "strings_hu.gperf"
       {"Non-numeric month in yahrtzeit file. Skipping line %s","Nem numerikus hónap a jorcájt fájlban. Sor kihagyása %s"},
-#line 49 "strings_hu.gperf"
+#line 50 "strings_hu.gperf"
       {"input file read error. Skipping line %s","Olvasási hiba a beviteli fájlban. Sor kihagyása %s"},
-#line 81 "strings_hu.gperf"
+#line 82 "strings_hu.gperf"
       {"Masei","Mászé"},
 #line 15 "strings_hu.gperf"
       {"Sukkah","Szukká"},
-#line 143 "strings_hu.gperf"
+#line 144 "strings_hu.gperf"
       {"Pesach IV (CH''M)","Peszách IV (CH''M)"},
-      {""},
-#line 177 "strings_hu.gperf"
+#line 36 "strings_hu.gperf"
+      {"Zevachim","Zváchim"},
+#line 179 "strings_hu.gperf"
       {"Shabbat Zachor","Sábát Záchor"},
-#line 174 "strings_hu.gperf"
+#line 176 "strings_hu.gperf"
       {"Shabbat Rosh Chodesh","Sábát Ros chódes"},
-      {""},
-#line 129 "strings_hu.gperf"
-      {"Erev Rosh Hashana","Erev Ros hásáná"},
-      {""}, {""},
-#line 147 "strings_hu.gperf"
+      {""}, {""}, {""}, {""},
+#line 148 "strings_hu.gperf"
       {"Pesach VII","Peszách VII"},
       {""},
-#line 155 "strings_hu.gperf"
+#line 157 "strings_hu.gperf"
       {"Av","Áv"},
       {""}, {""},
-#line 170 "strings_hu.gperf"
+#line 172 "strings_hu.gperf"
       {"Shabbat HaGadol","Sábát háGádol"},
-#line 99 "strings_hu.gperf"
+#line 100 "strings_hu.gperf"
       {"Toldot","Toldot"},
-#line 83 "strings_hu.gperf"
+#line 84 "strings_hu.gperf"
       {"Metzora","Möcorá"},
-#line 52 "strings_hu.gperf"
+#line 53 "strings_hu.gperf"
       {"Unrecognized hebrew month in input file.  Skipping line %s","Ismeretlen héber hónap a beviteli fájlban. Sor kihagyása %s"},
       {""},
-#line 61 "strings_hu.gperf"
+#line 62 "strings_hu.gperf"
       {"Balak","Bálák"},
       {""},
-#line 171 "strings_hu.gperf"
+#line 173 "strings_hu.gperf"
       {"Shabbat Machar Chodesh","Sábát Máchár chódes"},
       {""},
-#line 152 "strings_hu.gperf"
+#line 154 "strings_hu.gperf"
       {"Adar","Ádár"},
-#line 172 "strings_hu.gperf"
+#line 174 "strings_hu.gperf"
       {"Shabbat Nachamu","Sábát Náchámu"},
-#line 153 "strings_hu.gperf"
+#line 155 "strings_hu.gperf"
       {"Adar I","Ádár I"},
-#line 154 "strings_hu.gperf"
+#line 156 "strings_hu.gperf"
       {"Adar II","Ádár II"},
-      {""}, {""},
-#line 80 "strings_hu.gperf"
+      {""},
+#line 54 "strings_hu.gperf"
+      {"Date out of range in input file. Skipping line %s","Dátum a beviteli fájlon kívül. Sor kihagyása %s"},
+#line 81 "strings_hu.gperf"
       {"Lech-Lecha","Lech Löchá"},
-#line 148 "strings_hu.gperf"
+#line 149 "strings_hu.gperf"
       {"Pesach VIII","Peszách VIII"},
-      {""}, {""}, {""},
-#line 24 "strings_hu.gperf"
-      {"Nazir","Názír"},
-#line 84 "strings_hu.gperf"
+#line 167 "strings_hu.gperf"
+      {"Rosh Hashana","Ros hásáná"},
+#line 58 "strings_hu.gperf"
+      {"Date out of range in yahrtzeit file. Skipping line %s","Jorcájton kívül eső dátum. Sor kihagyása %s"},
+#line 168 "strings_hu.gperf"
+      {"Rosh Hashana I","Ros hásáná I"},
+#line 169 "strings_hu.gperf"
+      {"Rosh Hashana II","Ros hásáná II"},
+#line 85 "strings_hu.gperf"
       {"Miketz","Mikéc"},
 #line 40 "strings_hu.gperf"
       {"Arachin","Áráchin"},
-      {""}, {""}, {""},
-#line 132 "strings_hu.gperf"
+      {""},
+#line 170 "strings_hu.gperf"
+      {"Shabbat Chazon","Sábát Cházon"},
+#line 137 "strings_hu.gperf"
+      {"Lag BaOmer","Lág báOmer"},
+#line 133 "strings_hu.gperf"
       {"Erev Sukkot","Erev Szukkot"},
-#line 141 "strings_hu.gperf"
+#line 142 "strings_hu.gperf"
       {"Pesach II (CH''M)","Peszách II (CH''M)"},
       {""}, {""},
-#line 163 "strings_hu.gperf"
+#line 165 "strings_hu.gperf"
       {"Tamuz","Támuz"},
       {""},
 #line 16 "strings_hu.gperf"
       {"Beitzah","Bécá"},
       {""}, {""},
-#line 113 "strings_hu.gperf"
+#line 114 "strings_hu.gperf"
       {"Yitro","Jitró"},
-#line 58 "strings_hu.gperf"
+#line 59 "strings_hu.gperf"
       {"improper sedra year type calculated.","Nem megfelelő szidra évtípus lett kiszámítva."},
-#line 165 "strings_hu.gperf"
-      {"Rosh Hashana","Ros hásáná"},
-      {""},
-#line 166 "strings_hu.gperf"
-      {"Rosh Hashana I","Ros hásáná I"},
-#line 167 "strings_hu.gperf"
-      {"Rosh Hashana II","Ros hásáná II"},
+#line 153 "strings_hu.gperf"
+      {"Rosh Chodesh","Ros chódes"},
+      {""}, {""},
+#line 152 "strings_hu.gperf"
+      {"Rosh Chodesh %s","Ros chódes %s"},
 #line 29 "strings_hu.gperf"
       {"Baba Metzia","Bává Möciá"},
       {""}, {""}, {""}, {""},
-#line 201 "strings_hu.gperf"
-      {"Tzom Tammuz","Com Támuz"},
+#line 127 "strings_hu.gperf"
+      {"Days of the Omer","Az omer napjai"},
       {""},
 #line 18 "strings_hu.gperf"
       {"Megillah","Mögilá"},
-#line 53 "strings_hu.gperf"
-      {"Date out of range in input file. Skipping line %s","Dátum a beviteli fájlon kívül. Sor kihagyása %s"},
-      {""},
-#line 185 "strings_hu.gperf"
+      {""}, {""},
+#line 187 "strings_hu.gperf"
       {"Sukkot","Szukkot"},
       {""},
-#line 57 "strings_hu.gperf"
-      {"Date out of range in yahrtzeit file. Skipping line %s","Jorcájton kívül eső dátum. Sor kihagyása %s"},
-      {""},
 #line 136 "strings_hu.gperf"
-      {"Lag BaOmer","Lág báOmer"},
-#line 106 "strings_hu.gperf"
+      {"Havdalah","Hávdálá"},
+      {""},
+#line 24 "strings_hu.gperf"
+      {"Nazir","Názír"},
+#line 107 "strings_hu.gperf"
       {"Vayera","Váérá"},
-      {""}, {""},
-#line 168 "strings_hu.gperf"
-      {"Shabbat Chazon","Sábát Cházon"},
-#line 151 "strings_hu.gperf"
-      {"Rosh Chodesh %s","Ros chódes %s"},
-#line 96 "strings_hu.gperf"
-      {"Tazria","Tázriá"},
-#line 104 "strings_hu.gperf"
+      {""}, {""}, {""},
+#line 207 "strings_hu.gperf"
+      {"Yom Kippur","Jom kipur"},
+      {""},
+#line 105 "strings_hu.gperf"
       {"Vayechi","Vájechi"},
-#line 107 "strings_hu.gperf"
+#line 108 "strings_hu.gperf"
       {"Vayeshev","Vájésev"},
-      {""}, {""},
-#line 145 "strings_hu.gperf"
+      {""},
+#line 92 "strings_hu.gperf"
+      {"Re'eh","Röé"},
+#line 146 "strings_hu.gperf"
       {"Pesach V (CH''M)","Peszách V (CH''M)"},
       {""},
-#line 108 "strings_hu.gperf"
+#line 109 "strings_hu.gperf"
       {"Vayetzei","Vájécé"},
       {""}, {""},
-#line 196 "strings_hu.gperf"
+#line 198 "strings_hu.gperf"
       {"Tish'a B'Av","Tisá böÁv"},
-#line 169 "strings_hu.gperf"
+#line 171 "strings_hu.gperf"
       {"Shabbat HaChodesh","Sábát háChódes"},
-#line 186 "strings_hu.gperf"
+#line 188 "strings_hu.gperf"
       {"Sukkot I","Szukkot I"},
       {""},
-#line 111 "strings_hu.gperf"
+#line 112 "strings_hu.gperf"
       {"Vayishlach","Vájislách"},
-#line 69 "strings_hu.gperf"
+#line 70 "strings_hu.gperf"
       {"Chayei Sara","Chájé Szárá"},
       {""},
-#line 116 "strings_hu.gperf"
+#line 117 "strings_hu.gperf"
       {"Chanukah","Chánuká"},
       {""}, {""},
-#line 126 "strings_hu.gperf"
-      {"Days of the Omer","Az omer napjai"},
-      {""},
-#line 135 "strings_hu.gperf"
-      {"Havdalah","Hávdálá"},
-      {""},
-#line 91 "strings_hu.gperf"
-      {"Re'eh","Röé"},
-#line 194 "strings_hu.gperf"
+#line 203 "strings_hu.gperf"
+      {"Tzom Tammuz","Com Támuz"},
+      {""}, {""}, {""}, {""},
+#line 196 "strings_hu.gperf"
       {"Ta'anit Bechorot","Táánit Bechorot"},
       {""},
-#line 204 "strings_hu.gperf"
+#line 206 "strings_hu.gperf"
       {"Yom HaZikaron","Jom háZikáron"},
-#line 181 "strings_hu.gperf"
+#line 183 "strings_hu.gperf"
       {"Shmini Atzeret","Smini áceret"},
-#line 205 "strings_hu.gperf"
-      {"Yom Kippur","Jom kipur"},
+      {""},
 #line 32 "strings_hu.gperf"
       {"Makkot","Mákot"},
-#line 125 "strings_hu.gperf"
+#line 126 "strings_hu.gperf"
       {"Chanukah: 8th Day","Chánuká: 8. nap"},
-#line 117 "strings_hu.gperf"
+#line 118 "strings_hu.gperf"
       {"Chanukah: 1 Candle","Chánuká: 1 gyertya"},
-#line 124 "strings_hu.gperf"
+#line 125 "strings_hu.gperf"
       {"Chanukah: 8 Candles","Chánuká: 8 gyertya"},
-      {""}, {""}, {""}, {""},
-#line 123 "strings_hu.gperf"
-      {"Chanukah: 7 Candles","Chánuká: 7 gyertya"},
       {""},
-#line 206 "strings_hu.gperf"
-      {"Yom Yerushalayim","Jom Jerusáláim"},
-#line 146 "strings_hu.gperf"
+#line 97 "strings_hu.gperf"
+      {"Tazria","Tázriá"},
+      {""},
+#line 49 "strings_hu.gperf"
+      {"Daf Yomi","Daf Jomi"},
+#line 124 "strings_hu.gperf"
+      {"Chanukah: 7 Candles","Chánuká: 7 gyertya"},
+      {""}, {""},
+#line 147 "strings_hu.gperf"
       {"Pesach VI (CH''M)","Peszách VI (CH''M)"},
       {""},
-#line 122 "strings_hu.gperf"
+#line 123 "strings_hu.gperf"
       {"Chanukah: 6 Candles","Chánuká: 6 gyertya"},
-      {""}, {""}, {""}, {""},
-#line 121 "strings_hu.gperf"
+#line 48 "strings_hu.gperf"
+      {"Daf Yomi: %s %d","Daf Jomi: %s %d"},
+      {""}, {""},
+#line 138 "strings_hu.gperf"
+      {"Leil Selichot","Szlichot"},
+#line 122 "strings_hu.gperf"
       {"Chanukah: 5 Candles","Chánuká: 5 gyertya"},
-      {""}, {""}, {""}, {""},
-#line 187 "strings_hu.gperf"
+      {""},
+#line 208 "strings_hu.gperf"
+      {"Yom Yerushalayim","Jom Jerusáláim"},
+      {""}, {""},
+#line 189 "strings_hu.gperf"
       {"Sukkot II","Szukkot II"},
+      {""}, {""}, {""},
+#line 115 "strings_hu.gperf"
+      {"Asara B'Tevet","Ászárá böTévét"},
+#line 121 "strings_hu.gperf"
+      {"Chanukah: 4 Candles","Chánuká: 4 gyertya"},
       {""}, {""},
 #line 35 "strings_hu.gperf"
       {"Horayot","Horájot"},
-#line 114 "strings_hu.gperf"
-      {"Asara B'Tevet","Ászárá böTévét"},
-#line 120 "strings_hu.gperf"
-      {"Chanukah: 4 Candles","Chánuká: 4 gyertya"},
-      {""}, {""}, {""},
-#line 189 "strings_hu.gperf"
+#line 191 "strings_hu.gperf"
       {"Sukkot III (CH''M)","Szukkot III (CH''M)"},
-#line 119 "strings_hu.gperf"
+#line 120 "strings_hu.gperf"
       {"Chanukah: 3 Candles","Chánuká: 3 gyertya"},
       {""}, {""}, {""},
 #line 20 "strings_hu.gperf"
       {"Chagigah","Chágigá"},
-#line 118 "strings_hu.gperf"
+#line 119 "strings_hu.gperf"
       {"Chanukah: 2 Candles","Chánuká: 2 gyertya"},
-#line 48 "strings_hu.gperf"
-      {"Daf Yomi: %s %d","Daf Jomi: %s %d"},
-      {""},
-#line 110 "strings_hu.gperf"
+      {""}, {""},
+#line 111 "strings_hu.gperf"
       {"Vayikra","Vájikrá"},
-      {""}, {""}, {""}, {""}, {""},
-#line 137 "strings_hu.gperf"
-      {"Leil Selichot","Szlichot"},
-      {""},
-#line 77 "strings_hu.gperf"
-      {"Ki Teitzei","Ki Técé"},
-      {""},
-#line 207 "strings_hu.gperf"
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 209 "strings_hu.gperf"
       {"Yom HaAliyah","Jom háAlija"},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 112 "strings_hu.gperf"
-      {"Vezot Haberakhah","Vözot háböráchá"},
-      {""}, {""}, {""}, {""}, {""},
-#line 34 "strings_hu.gperf"
-      {"Avodah Zarah","Ávodá Zárá"},
-      {""},
-#line 105 "strings_hu.gperf"
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""}, {""}, {""}, {""},
+#line 75 "strings_hu.gperf"
+      {"Ha'Azinu","Háázinu"},
+#line 106 "strings_hu.gperf"
       {"Vayeilech","Vájélech"},
       {""}, {""}, {""},
-#line 54 "strings_hu.gperf"
+#line 55 "strings_hu.gperf"
       {"yahrtzeit file read error. Skipping line %s","Jorcájt fájl-olvasási hiba. Sor kihagyása %s"},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 202 "strings_hu.gperf"
+      {""}, {""}, {""},
+#line 34 "strings_hu.gperf"
+      {"Avodah Zarah","Ávodá Zárá"},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 78 "strings_hu.gperf"
+      {"Ki Teitzei","Ki Técé"},
+      {""}, {""}, {""},
+#line 204 "strings_hu.gperf"
       {"Yom HaAtzma'ut","Jom háÁcmáut"},
       {""}, {""},
-#line 190 "strings_hu.gperf"
+#line 192 "strings_hu.gperf"
       {"Sukkot IV (CH''M)","Szukkot IV (CH''M)"},
-      {""}, {""}, {""}, {""}, {""},
-#line 74 "strings_hu.gperf"
-      {"Ha'Azinu","Háázinu"},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 64 "strings_hu.gperf"
+      {""}, {""}, {""},
+#line 113 "strings_hu.gperf"
+      {"Vezot Haberakhah","Vözot háböráchá"},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""},
+#line 65 "strings_hu.gperf"
       {"Beha'alotcha","Beháálotchá"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 193 "strings_hu.gperf"
+#line 195 "strings_hu.gperf"
       {"Sukkot VII (Hoshana Raba)","Szukkot VII (Hosáná rábá)"},
       {""}, {""},
-#line 103 "strings_hu.gperf"
+#line 104 "strings_hu.gperf"
       {"Vayakhel","Vájákhél"},
       {""},
-#line 115 "strings_hu.gperf"
+#line 116 "strings_hu.gperf"
       {"Candle lighting","Gyertyagyújtás"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""},
-#line 188 "strings_hu.gperf"
+#line 190 "strings_hu.gperf"
       {"Sukkot II (CH''M)","Szukkot II (CH''M)"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""},
-#line 191 "strings_hu.gperf"
+#line 193 "strings_hu.gperf"
       {"Sukkot V (CH''M)","Szukkot V (CH''M)"},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 109 "strings_hu.gperf"
+#line 110 "strings_hu.gperf"
       {"Vayigash","Vájigás"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""},
-#line 203 "strings_hu.gperf"
+#line 205 "strings_hu.gperf"
       {"Yom HaShoah","Jom háSoá"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 192 "strings_hu.gperf"
+#line 194 "strings_hu.gperf"
       {"Sukkot VI (CH''M)","Szukkot VI (CH''M)"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""},
-#line 60 "strings_hu.gperf"
+#line 61 "strings_hu.gperf"
       {"Achrei Mot","Ácháré Mot"}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      unsigned int key = hash (str, len);
+      register unsigned int key = hash (str, len);
 
       if (key <= MAX_HASH_VALUE)
         {
--- hebcal-4.20.orig/strings_pl.c
+++ hebcal-4.20/strings_pl.c
@@ -35,12 +35,12 @@
 #line 7 "strings_pl.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 99
+#define TOTAL_KEYWORDS 100
 #define MIN_WORD_LENGTH 4
 #define MAX_WORD_LENGTH 25
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 153
-/* maximum key range = 148, duplicates = 0 */
+#define MIN_HASH_VALUE 12
+#define MAX_HASH_VALUE 177
+/* maximum key range = 166, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -54,32 +54,32 @@ hash (register const char *str, register
 {
   static unsigned char asso_values[] =
     {
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154,  35, 154, 154, 154, 154,  20, 154,  40,
-      154, 154, 154, 154, 154,   5, 154, 154, 154,   0,
-       30,  25,  20,  15,  10,   5,   0, 154, 154, 154,
-      154, 154, 154, 154, 154,  55,  60,  75,  25,   0,
-      154,  90,  15, 154, 154,  45,   5,  65, 105, 154,
-       45, 154,   0,   0,  30, 154,   0, 154, 154,  55,
-      154, 154, 154, 154, 154, 154, 154,  15,   0,   5,
-        5,   0,  15,  45,  20,  25, 154,  35,   5,   0,
-        0,  10,   0, 154,   0,   5,   0,   5,  55, 154,
-      154,  35,  35, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-      154, 154, 154, 154, 154, 154
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178,  35, 178, 178, 178, 178,  20, 178,  30,
+      178, 178, 178, 178, 178,  40, 178, 178, 178,  10,
+       35,  30,  25,  20,  15,   5,   0, 178, 178, 178,
+      178, 178, 178, 178, 178,  75,  65,  70,   5,   0,
+      178,  60,  20, 178, 178,  35,  40,  70,   5, 178,
+       80, 178,   5,   0,  35, 178,   0, 178, 178,  45,
+      178, 178, 178, 178, 178, 178, 178,  15,   0,   5,
+       30,   0,  15,  30,  35,  55, 178,  40,   0,  25,
+       10,  10,   0, 178,  10,   5,   0,   5,  10, 178,
+      178,  35,  35, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+      178, 178, 178, 178, 178, 178
     };
   register unsigned int hval = len;
 
@@ -113,15 +113,11 @@ hebcal_lookup_pl (register const char *s
 {
   static struct event_title wordlist[] =
     {
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 41 "strings_pl.gperf"
-      {"Shmini","Szemini"},
-      {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""},
 #line 15 "strings_pl.gperf"
       {"Shevuot","Szewuot"},
-      {""},
-#line 98 "strings_pl.gperf"
-      {"Shmini Atzeret","Szmini Aceret"},
+      {""}, {""},
 #line 48 "strings_pl.gperf"
       {"Vaetchanan","Waetchanan"},
 #line 40 "strings_pl.gperf"
@@ -137,42 +133,40 @@ hebcal_lookup_pl (register const char *s
 #line 11 "strings_pl.gperf"
       {"Shekalim","Szekalim"},
       {""},
-#line 30 "strings_pl.gperf"
-      {"Lech-Lecha","Lech Lecha"},
+#line 35 "strings_pl.gperf"
+      {"Nasso","Naso"},
       {""},
-#line 95 "strings_pl.gperf"
-      {"Shavuot","Szawuot"},
-#line 90 "strings_pl.gperf"
-      {"Shabbat Parah","Szabbat Parah"},
 #line 96 "strings_pl.gperf"
-      {"Shavuot I","Szawuot I"},
+      {"Shavuot","Szawuot"},
+#line 36 "strings_pl.gperf"
+      {"Nitzavim","Nicawim"},
 #line 97 "strings_pl.gperf"
+      {"Shavuot I","Szawuot I"},
+#line 98 "strings_pl.gperf"
       {"Shavuot II","Szawuot II"},
-#line 92 "strings_pl.gperf"
-      {"Shabbat Shekalim","Szabbat Szekalim"},
-      {""},
 #line 93 "strings_pl.gperf"
-      {"Shabbat Shuva","Szabbat Szuva"},
+      {"Shabbat Shekalim","Szabbat Szekalim"},
+#line 24 "strings_pl.gperf"
+      {"Devarim","Dewarim"},
 #line 94 "strings_pl.gperf"
+      {"Shabbat Shuva","Szabbat Szuva"},
+#line 95 "strings_pl.gperf"
       {"Shabbat Zachor","Szabbat Zachor"},
-#line 89 "strings_pl.gperf"
+#line 90 "strings_pl.gperf"
       {"Shabbat Nachamu","Szabbat Nachamu"},
-#line 10 "strings_pl.gperf"
-      {"Eruvin","Eruwin"},
-#line 44 "strings_pl.gperf"
-      {"Terumah","Teruma"},
-#line 99 "strings_pl.gperf"
-      {"Shushan Purim","Szuszan Purim"},
-      {""},
+      {""}, {""},
 #line 91 "strings_pl.gperf"
+      {"Shabbat Parah","Szabbat Parah"},
+      {""},
+#line 92 "strings_pl.gperf"
       {"Shabbat Rosh Chodesh","Szabbat Rosz Chodesz"},
-#line 52 "strings_pl.gperf"
-      {"Vayera","Wajera"},
-#line 88 "strings_pl.gperf"
+#line 41 "strings_pl.gperf"
+      {"Shmini","Szemini"},
+#line 89 "strings_pl.gperf"
       {"Shabbat Machar Chodesh","Szabbat Machar Chodesz"},
 #line 54 "strings_pl.gperf"
       {"Vayetzei","Wajece"},
-#line 85 "strings_pl.gperf"
+#line 86 "strings_pl.gperf"
       {"Shabbat Chazon","Szabbat Chazon"},
 #line 74 "strings_pl.gperf"
       {"Erev Purim","Erew Purim"},
@@ -182,55 +176,67 @@ hebcal_lookup_pl (register const char *s
       {"Vayechi","Wajechi"},
 #line 53 "strings_pl.gperf"
       {"Vayeshev","Wajeszew"},
-#line 46 "strings_pl.gperf"
-      {"Tzav","Caw"},
+#line 99 "strings_pl.gperf"
+      {"Shmini Atzeret","Szmini Aceret"},
 #line 57 "strings_pl.gperf"
       {"Vayishlach","Waiszlach"},
+#line 52 "strings_pl.gperf"
+      {"Vayera","Wajera"},
+#line 39 "strings_pl.gperf"
+      {"Sh'lach","Szelach"},
+#line 80 "strings_pl.gperf"
+      {"Havdalah","Hawdala"},
+#line 46 "strings_pl.gperf"
+      {"Tzav","Caw"},
+#line 25 "strings_pl.gperf"
+      {"Eikev","Ekew"},
+      {""},
+#line 76 "strings_pl.gperf"
+      {"Erev Shavuot","Erew Szawuot"},
+#line 45 "strings_pl.gperf"
+      {"Tetzaveh","Tecawe"},
+      {""},
+#line 59 "strings_pl.gperf"
+      {"Yitro","Jitro"},
 #line 58 "strings_pl.gperf"
       {"Vezot Haberakhah","Wezor Habracha"},
 #line 82 "strings_pl.gperf"
-      {"Rosh Hashana","rosz Haszana"},
-#line 45 "strings_pl.gperf"
-      {"Tetzaveh","Tecawe"},
+      {"Rosh Chodesh","Rosz Chodesz"},
+#line 100 "strings_pl.gperf"
+      {"Shushan Purim","Szuszan Purim"},
+      {""},
+#line 81 "strings_pl.gperf"
+      {"Rosh Chodesh %s","Rosz Chodesz %s"},
+#line 10 "strings_pl.gperf"
+      {"Eruvin","Eruwin"},
 #line 83 "strings_pl.gperf"
-      {"Rosh Hashana I","Rosz Haszana I"},
+      {"Rosh Hashana","rosz Haszana"},
+#line 77 "strings_pl.gperf"
+      {"Erev Simchat Torah","Erew Simchat Tora"},
 #line 84 "strings_pl.gperf"
+      {"Rosh Hashana I","Rosz Haszana I"},
+#line 85 "strings_pl.gperf"
       {"Rosh Hashana II","Rosz Haszana II"},
       {""},
-#line 76 "strings_pl.gperf"
-      {"Erev Shavuot","Erew Szawuot"},
-#line 17 "strings_pl.gperf"
-      {"Parashat","Parsza"},
+#line 75 "strings_pl.gperf"
+      {"Erev Rosh Hashana","Erew Rosz Haszana"},
+#line 55 "strings_pl.gperf"
+      {"Vayigash","Wajigasz"},
 #line 12 "strings_pl.gperf"
       {"Yoma","Joma"},
-#line 81 "strings_pl.gperf"
-      {"Rosh Chodesh %s","Rosz Chodesz %s"},
+#line 38 "strings_pl.gperf"
+      {"Re'eh","Ree"},
       {""},
-#line 39 "strings_pl.gperf"
-      {"Sh'lach","Szelach"},
+#line 44 "strings_pl.gperf"
+      {"Terumah","Teruma"},
 #line 27 "strings_pl.gperf"
       {"Kedoshim","Kedoszim"},
 #line 14 "strings_pl.gperf"
       {"Kiddushin","Kidduszin"},
-#line 38 "strings_pl.gperf"
-      {"Re'eh","Ree"},
+#line 29 "strings_pl.gperf"
+      {"Ki Teitzei","Ki Tece"},
 #line 73 "strings_pl.gperf"
       {"Erev Pesach","Erew Pesach"},
-#line 75 "strings_pl.gperf"
-      {"Erev Rosh Hashana","Erew Rosz Haszana"},
-#line 77 "strings_pl.gperf"
-      {"Erev Simchat Torah","Erew Simchat Tora"},
-#line 51 "strings_pl.gperf"
-      {"Vayeilech","Waejlech"},
-#line 59 "strings_pl.gperf"
-      {"Yitro","Jitro"},
-      {""}, {""},
-#line 21 "strings_pl.gperf"
-      {"Bereshit","Bereszit"},
-      {""},
-#line 79 "strings_pl.gperf"
-      {"Erev Yom Kippur","Erew Jom Kippur"},
-      {""},
 #line 56 "strings_pl.gperf"
       {"Vayikra","Wajikra"},
 #line 49 "strings_pl.gperf"
@@ -242,103 +248,103 @@ hebcal_lookup_pl (register const char *s
       {""},
 #line 32 "strings_pl.gperf"
       {"Metzora","Mecora"},
-#line 105 "strings_pl.gperf"
-      {"Yom HaZikaron","Jom HaZikaron"},
-#line 102 "strings_pl.gperf"
+#line 21 "strings_pl.gperf"
+      {"Bereshit","Bereszit"},
+#line 103 "strings_pl.gperf"
       {"Ta'anit Esther","Post Esther"},
-#line 18 "strings_pl.gperf"
-      {"Achrei Mot","Achare Mot"},
-      {""},
-#line 24 "strings_pl.gperf"
-      {"Devarim","Dewarim"},
-#line 55 "strings_pl.gperf"
-      {"Vayigash","Wajigasz"},
+#line 88 "strings_pl.gperf"
+      {"Shabbat HaGadol","Szabbat HaGadol"},
+#line 72 "strings_pl.gperf"
+      {"Days of the Omer","Dni Omeru"},
+#line 28 "strings_pl.gperf"
+      {"Ki Tavo","Ki Tawo"},
+#line 26 "strings_pl.gperf"
+      {"Ha'Azinu","Haazinu"},
 #line 22 "strings_pl.gperf"
       {"Beshalach","Beszalach"},
-#line 29 "strings_pl.gperf"
-      {"Ki Teitzei","Ki Tece"},
-#line 101 "strings_pl.gperf"
+#line 30 "strings_pl.gperf"
+      {"Lech-Lecha","Lech Lecha"},
+#line 102 "strings_pl.gperf"
       {"Ta'anit Bechorot","Post Bechorot"},
-#line 37 "strings_pl.gperf"
-      {"Pekudei","Pekude"},
-#line 80 "strings_pl.gperf"
-      {"Havdalah","Hawdala"},
       {""},
-#line 25 "strings_pl.gperf"
-      {"Eikev","Ekew"},
-#line 43 "strings_pl.gperf"
-      {"Tazria","Tazrija"},
-      {""},
-#line 26 "strings_pl.gperf"
-      {"Ha'Azinu","Haazinu"},
-#line 103 "strings_pl.gperf"
-      {"Yom HaAtzma'ut","Jom HaAtzma'ut"},
-#line 31 "strings_pl.gperf"
-      {"Masei","Mase"},
-#line 104 "strings_pl.gperf"
-      {"Yom HaShoah","Jom HaShoah"},
-#line 28 "strings_pl.gperf"
-      {"Ki Tavo","Ki Tawo"},
 #line 62 "strings_pl.gperf"
       {"Chanukah","Chanuka"},
+#line 51 "strings_pl.gperf"
+      {"Vayeilech","Waejlech"},
+#line 16 "strings_pl.gperf"
+      {"Daf Yomi: %s %d","Daf Yomi: %s %d"},
       {""},
-#line 100 "strings_pl.gperf"
-      {"Sukkot VII (Hoshana Raba)","Sukkot VII (Hoszana Raba)"},
-#line 33 "strings_pl.gperf"
-      {"Miketz","Mikec"},
-#line 86 "strings_pl.gperf"
+#line 87 "strings_pl.gperf"
       {"Shabbat HaChodesh","Szabbat HaChodesz"},
-      {""}, {""},
-#line 106 "strings_pl.gperf"
-      {"Yom Kippur","Jom Kippur"},
-#line 72 "strings_pl.gperf"
-      {"Days of the Omer","Dni Omeru"},
+#line 17 "strings_pl.gperf"
+      {"Parashat","Parsza"},
+      {""},
+#line 79 "strings_pl.gperf"
+      {"Erev Yom Kippur","Erew Jom Kippur"},
+      {""},
 #line 71 "strings_pl.gperf"
       {"Chanukah: 8th Day","Chanuka: Dzień ósmy"},
-#line 63 "strings_pl.gperf"
-      {"Chanukah: 1 Candle","Chanuka: Pierwsza świeca"},
+#line 13 "strings_pl.gperf"
+      {"Megillah","Megilla"},
 #line 70 "strings_pl.gperf"
       {"Chanukah: 8 Candles","Chanuka: Ósma świeca"},
-#line 61 "strings_pl.gperf"
-      {"Candle lighting","Zapalenie świec"},
+#line 101 "strings_pl.gperf"
+      {"Sukkot VII (Hoshana Raba)","Sukkot VII (Hoszana Raba)"},
 #line 23 "strings_pl.gperf"
       {"Chayei Sara","Chaje Sara"},
-      {""}, {""},
+      {""},
+#line 106 "strings_pl.gperf"
+      {"Yom HaZikaron","Jom HaZikaron"},
 #line 69 "strings_pl.gperf"
       {"Chanukah: 7 Candles","Chanuka: Siódma świeca"},
-#line 87 "strings_pl.gperf"
-      {"Shabbat HaGadol","Szabbat HaGadol"},
-      {""}, {""},
-#line 13 "strings_pl.gperf"
-      {"Megillah","Megilla"},
+#line 107 "strings_pl.gperf"
+      {"Yom Kippur","Jom Kippur"},
+#line 33 "strings_pl.gperf"
+      {"Miketz","Mikec"},
+      {""},
+#line 63 "strings_pl.gperf"
+      {"Chanukah: 1 Candle","Chanuka: Pierwsza świeca"},
+#line 104 "strings_pl.gperf"
+      {"Yom HaAtzma'ut","Jom HaAtzma'ut"},
+#line 18 "strings_pl.gperf"
+      {"Achrei Mot","Achare Mot"},
+      {""}, {""}, {""},
 #line 68 "strings_pl.gperf"
       {"Chanukah: 6 Candles","Chanuka: Szósta świeca"},
-#line 35 "strings_pl.gperf"
-      {"Nasso","Naso"},
-      {""}, {""},
-#line 36 "strings_pl.gperf"
-      {"Nitzavim","Nicawim"},
+      {""}, {""}, {""},
+#line 60 "strings_pl.gperf"
+      {"Asara B'Tevet","Asara B'Tevet"},
 #line 67 "strings_pl.gperf"
       {"Chanukah: 5 Candles","Chanuka: Piąta świeca"},
-#line 16 "strings_pl.gperf"
-      {"Daf Yomi: %s %d","Daf Yomi: %s %d"},
-      {""}, {""}, {""},
+#line 61 "strings_pl.gperf"
+      {"Candle lighting","Zapalenie świec"},
+#line 43 "strings_pl.gperf"
+      {"Tazria","Tazrija"},
+      {""}, {""},
 #line 66 "strings_pl.gperf"
       {"Chanukah: 4 Candles","Chanuka: Czwarta świeca"},
-      {""}, {""}, {""}, {""},
+#line 31 "strings_pl.gperf"
+      {"Masei","Mase"},
+#line 105 "strings_pl.gperf"
+      {"Yom HaShoah","Jom HaShoah"},
+      {""}, {""},
 #line 65 "strings_pl.gperf"
       {"Chanukah: 3 Candles","Chanuka: Trzecia świeca"},
-      {""},
-#line 107 "strings_pl.gperf"
-      {"Yom Yerushalayim","Jom Yerushalayim"},
-      {""}, {""},
+      {""}, {""}, {""}, {""},
 #line 64 "strings_pl.gperf"
       {"Chanukah: 2 Candles","Chanuka: Druga świeca"},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""},
+#line 108 "strings_pl.gperf"
+      {"Yom Yerushalayim","Jom Yerushalayim"},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""},
+#line 37 "strings_pl.gperf"
+      {"Pekudei","Pekude"},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""},
 #line 20 "strings_pl.gperf"
-      {"Beha'alotcha","Behaalotcha"},
-#line 60 "strings_pl.gperf"
-      {"Asara B'Tevet","Asara B'Tevet"}
+      {"Beha'alotcha","Behaalotcha"}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
--- hebcal-4.20.orig/strings_ru.c
+++ hebcal-4.20/strings_ru.c
@@ -35,7 +35,7 @@
 #line 7 "strings_ru.gperf"
 struct event_title { char *name; char *dest; };
 
-#define TOTAL_KEYWORDS 188
+#define TOTAL_KEYWORDS 190
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 25
 #define MIN_HASH_VALUE 4
@@ -61,11 +61,11 @@ hash (register const char *str, register
         0, 461, 461, 461, 461, 461,   5, 461, 461,   0,
        45,  40,  35,  20,  15,  10,   0, 461, 461,   0,
       461, 461, 461, 461, 461,  75,  55,  90, 135,  15,
-        5, 110,  45,   0,   0,  80,   5,  40, 140,   5,
+        5, 110,  45,   0,   0,  80,   5,  40, 140,  10,
         5,  35,  70,   0,   0,   5,  10, 165, 461, 125,
        10,   0, 461, 461, 461, 461, 461,  30,  10,  15,
         0,  35,  65,   0,  80,   5,  80,   0,  75,  55,
-       65, 100,   0,   5,   0,   0,  20,   5,   0,  25,
+       65, 100,   0,   5,   0,   0,  20,   5,   0,  60,
       461,  85, 110, 125, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
       461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
@@ -118,189 +118,189 @@ hebcal_lookup_ru (register const char *s
   static struct event_title wordlist[] =
     {
       {""}, {""}, {""}, {""},
-#line 173 "strings_ru.gperf"
+#line 175 "strings_ru.gperf"
       {"Sigd","Сигд"},
       {""},
-#line 175 "strings_ru.gperf"
+#line 177 "strings_ru.gperf"
       {"Sukkot","Суккот"},
-#line 187 "strings_ru.gperf"
+#line 189 "strings_ru.gperf"
       {"Tu B'Av","Пятнадцатое Ава"},
-#line 176 "strings_ru.gperf"
+#line 178 "strings_ru.gperf"
       {"Sukkot I","Суккот I"},
-#line 177 "strings_ru.gperf"
+#line 179 "strings_ru.gperf"
       {"Sukkot II","Суккот II"},
-#line 154 "strings_ru.gperf"
+#line 156 "strings_ru.gperf"
       {"Tevet","Тевет"},
-#line 128 "strings_ru.gperf"
+#line 129 "strings_ru.gperf"
       {"Pesach","Пэсах"},
       {""},
-#line 129 "strings_ru.gperf"
-      {"Pesach I","Пэсах I"},
 #line 130 "strings_ru.gperf"
+      {"Pesach I","Пэсах I"},
+#line 131 "strings_ru.gperf"
       {"Pesach II","Пэсах II"},
       {""},
 #line 15 "strings_ru.gperf"
       {"Sukkah","Сукка"},
-#line 178 "strings_ru.gperf"
+#line 180 "strings_ru.gperf"
       {"Sukkot II (CH''M)","Второй день Суккота (Холь Амоэд)"},
-#line 179 "strings_ru.gperf"
+#line 181 "strings_ru.gperf"
       {"Sukkot III (CH''M)","Третий день Суккота (Холь Амоэд)"},
       {""},
-#line 189 "strings_ru.gperf"
+#line 191 "strings_ru.gperf"
       {"Tu B'Shvat","Пятнадцатое Швата"},
       {""},
-#line 131 "strings_ru.gperf"
-      {"Pesach II (CH''M)","Второй день Пэсах, Холь Амоэд"},
 #line 132 "strings_ru.gperf"
+      {"Pesach II (CH''M)","Второй день Пэсах, Холь Амоэд"},
+#line 133 "strings_ru.gperf"
       {"Pesach III (CH''M)","Третий день Пэсах, Холь Амоэд"},
-#line 147 "strings_ru.gperf"
+#line 149 "strings_ru.gperf"
       {"Elul","Элул"},
-#line 137 "strings_ru.gperf"
-      {"Pesach VII","Седьмой день Пэсах"},
 #line 138 "strings_ru.gperf"
+      {"Pesach VII","Седьмой день Пэсах"},
+#line 139 "strings_ru.gperf"
       {"Pesach VIII","Восьмой день Пэсах"},
-#line 182 "strings_ru.gperf"
+#line 184 "strings_ru.gperf"
       {"Sukkot VI (CH''M)","Шестой день Суккота (Холь Амоэд)"},
       {""}, {""},
 #line 25 "strings_ru.gperf"
       {"Sotah","Сота"},
       {""},
-#line 136 "strings_ru.gperf"
+#line 137 "strings_ru.gperf"
       {"Pesach VI (CH''M)","Шестой день Пэсах, Холь Амоэд"},
       {""},
-#line 90 "strings_ru.gperf"
+#line 91 "strings_ru.gperf"
       {"Tzav","Цав"},
-#line 183 "strings_ru.gperf"
+#line 185 "strings_ru.gperf"
       {"Sukkot VII (Hoshana Raba)","Седьмой день Суккота (Ошана Раба)"},
       {""},
-#line 168 "strings_ru.gperf"
+#line 170 "strings_ru.gperf"
       {"Shavuot","Шавуот"},
       {""},
-#line 169 "strings_ru.gperf"
+#line 171 "strings_ru.gperf"
       {"Shavuot I","Шавуот I"},
-#line 170 "strings_ru.gperf"
+#line 172 "strings_ru.gperf"
       {"Shavuot II","Шавуот II"},
-#line 83 "strings_ru.gperf"
+#line 84 "strings_ru.gperf"
       {"Shemot","Шмот"},
 #line 33 "strings_ru.gperf"
       {"Shevuot","Швуот"},
-      {""}, {""},
-#line 62 "strings_ru.gperf"
-      {"Eikev","Эйкев"},
+      {""}, {""}, {""},
 #line 32 "strings_ru.gperf"
       {"Makkot","Макот"},
-#line 79 "strings_ru.gperf"
+#line 80 "strings_ru.gperf"
       {"Pekudei","Пкудей"},
       {""}, {""},
 #line 46 "strings_ru.gperf"
       {"Midot","Мидот"},
-#line 74 "strings_ru.gperf"
+#line 75 "strings_ru.gperf"
       {"Miketz","Микец"},
 #line 10 "strings_ru.gperf"
       {"Shabbat","Шаббат"},
-#line 49 "strings_ru.gperf"
+#line 50 "strings_ru.gperf"
       {"Parashat","Глава"},
       {""},
-#line 70 "strings_ru.gperf"
+#line 71 "strings_ru.gperf"
       {"Lech-Lecha","Лех-Леха"},
       {""},
-#line 58 "strings_ru.gperf"
+#line 59 "strings_ru.gperf"
       {"Bo","Бо"},
-#line 172 "strings_ru.gperf"
+#line 174 "strings_ru.gperf"
       {"Shushan Purim","Шушан Пурим"},
       {""},
-#line 91 "strings_ru.gperf"
+#line 92 "strings_ru.gperf"
       {"Vaera","Ваера"},
 #line 43 "strings_ru.gperf"
       {"Meilah","Меила"},
 #line 41 "strings_ru.gperf"
       {"Temurah","Тмура"},
-#line 166 "strings_ru.gperf"
+#line 168 "strings_ru.gperf"
       {"Shabbat Shuva","Шаббат Шува"},
       {""},
-#line 164 "strings_ru.gperf"
+#line 166 "strings_ru.gperf"
       {"Shabbat Rosh Chodesh","Шаббат Новомесячья"},
-#line 186 "strings_ru.gperf"
+#line 188 "strings_ru.gperf"
       {"Tish'a B'Av","Девятое Ава"},
-#line 73 "strings_ru.gperf"
+#line 74 "strings_ru.gperf"
       {"Metzora","Мецора"},
 #line 12 "strings_ru.gperf"
       {"Pesachim","Песахим"},
       {""},
-#line 72 "strings_ru.gperf"
+#line 73 "strings_ru.gperf"
       {"Matot","Матот"},
       {""},
-#line 87 "strings_ru.gperf"
+#line 88 "strings_ru.gperf"
       {"Terumah","Трума"},
 #line 36 "strings_ru.gperf"
       {"Zevachim","Звахим"},
-#line 167 "strings_ru.gperf"
+#line 169 "strings_ru.gperf"
       {"Shabbat Zachor","Шаббат Захор"},
-#line 139 "strings_ru.gperf"
+#line 140 "strings_ru.gperf"
       {"Purim","Пурим"},
       {""},
-#line 145 "strings_ru.gperf"
+#line 147 "strings_ru.gperf"
       {"Av","Ав"},
-#line 174 "strings_ru.gperf"
+#line 176 "strings_ru.gperf"
       {"Simchat Torah","Симхат Тора"},
       {""},
-#line 162 "strings_ru.gperf"
-      {"Shabbat Nachamu","Шаббат Нахаму"},
-#line 89 "strings_ru.gperf"
+#line 63 "strings_ru.gperf"
+      {"Eikev","Эйкев"},
+#line 90 "strings_ru.gperf"
       {"Toldot","Толдот"},
-#line 80 "strings_ru.gperf"
+#line 81 "strings_ru.gperf"
       {"Pinchas","Пинхас"},
 #line 9 "strings_ru.gperf"
       {"Berachot","Благословения"},
-      {""}, {""},
-#line 69 "strings_ru.gperf"
+      {""},
+#line 164 "strings_ru.gperf"
+      {"Shabbat Nachamu","Шаббат Нахаму"},
+#line 70 "strings_ru.gperf"
       {"Korach","Корах"},
-#line 134 "strings_ru.gperf"
+#line 135 "strings_ru.gperf"
       {"Pesach Sheni","Второй Пэсах"},
       {""}, {""},
-#line 148 "strings_ru.gperf"
+#line 150 "strings_ru.gperf"
       {"Iyyar","Ияр"},
       {""},
 #line 42 "strings_ru.gperf"
       {"Keritot","Критот"},
-#line 163 "strings_ru.gperf"
+#line 165 "strings_ru.gperf"
       {"Shabbat Parah","Шаббат Пара"},
-#line 57 "strings_ru.gperf"
+#line 58 "strings_ru.gperf"
       {"Beshalach","Бешалах"},
 #line 45 "strings_ru.gperf"
       {"Tamid","Тамид"},
-#line 165 "strings_ru.gperf"
+#line 167 "strings_ru.gperf"
       {"Shabbat Shekalim","Шаббат Шкалим"},
-#line 66 "strings_ru.gperf"
+#line 67 "strings_ru.gperf"
       {"Ki Tavo","Ки Таво"},
 #line 39 "strings_ru.gperf"
       {"Bechorot","Бехорот"},
       {""},
-#line 188 "strings_ru.gperf"
+#line 190 "strings_ru.gperf"
       {"Tu BiShvat","Пятнадцатое Швата"},
-#line 96 "strings_ru.gperf"
+#line 97 "strings_ru.gperf"
       {"Vayera","Ваера"},
-#line 94 "strings_ru.gperf"
+#line 95 "strings_ru.gperf"
       {"Vayechi","Ваехи"},
-#line 56 "strings_ru.gperf"
+#line 57 "strings_ru.gperf"
       {"Bereshit","Берешит"},
       {""},
-#line 152 "strings_ru.gperf"
+#line 154 "strings_ru.gperf"
       {"Sivan","Сиван"},
 #line 11 "strings_ru.gperf"
       {"Eruvin","Эрувин"},
       {""},
 #line 13 "strings_ru.gperf"
       {"Shekalim","Шкалим"},
-#line 142 "strings_ru.gperf"
+#line 144 "strings_ru.gperf"
       {"Adar","Адар"},
-#line 53 "strings_ru.gperf"
+#line 54 "strings_ru.gperf"
       {"Bechukotai","Бехукотай"},
-#line 60 "strings_ru.gperf"
+#line 61 "strings_ru.gperf"
       {"Chukat","Хукат"},
-#line 85 "strings_ru.gperf"
+#line 86 "strings_ru.gperf"
       {"Shoftim","Шофтим"},
-#line 98 "strings_ru.gperf"
+#line 99 "strings_ru.gperf"
       {"Vayetzei","Ваеце"},
       {""},
 #line 30 "strings_ru.gperf"
@@ -309,125 +309,125 @@ hebcal_lookup_ru (register const char *s
       {"Taanit","Пост"},
 #line 40 "strings_ru.gperf"
       {"Arachin","Арахин"},
-#line 88 "strings_ru.gperf"
+#line 89 "strings_ru.gperf"
       {"Tetzaveh","Тецаве"},
-#line 63 "strings_ru.gperf"
+#line 64 "strings_ru.gperf"
       {"Emor","Эмор"},
       {""},
-#line 123 "strings_ru.gperf"
+#line 124 "strings_ru.gperf"
       {"Erev Tish'a B'Av","Вечер Девятого Ава"},
 #line 22 "strings_ru.gperf"
       {"Ketubot","Ктубот"},
-#line 97 "strings_ru.gperf"
+#line 98 "strings_ru.gperf"
       {"Vayeshev","Ваешев"},
-#line 75 "strings_ru.gperf"
+#line 76 "strings_ru.gperf"
       {"Mishpatim","Мишпатим"},
-#line 71 "strings_ru.gperf"
+#line 72 "strings_ru.gperf"
       {"Masei","Масей"},
-#line 151 "strings_ru.gperf"
+#line 153 "strings_ru.gperf"
       {"Sh'vat","Шват"},
-#line 82 "strings_ru.gperf"
+#line 83 "strings_ru.gperf"
       {"Sh'lach","Шлах"},
       {""}, {""},
-#line 92 "strings_ru.gperf"
+#line 93 "strings_ru.gperf"
       {"Vaetchanan","Ваитханан"},
-#line 143 "strings_ru.gperf"
+#line 145 "strings_ru.gperf"
       {"Adar I","Адар I"},
-#line 144 "strings_ru.gperf"
+#line 146 "strings_ru.gperf"
       {"Adar II","Адар II"},
 #line 37 "strings_ru.gperf"
       {"Menachot","Менахот"},
       {""},
 #line 19 "strings_ru.gperf"
       {"Moed Katan","Моэд Катан"},
-#line 181 "strings_ru.gperf"
+#line 183 "strings_ru.gperf"
       {"Sukkot V (CH''M)","Пятый день Суккота (Холь Амоэд)"},
-#line 119 "strings_ru.gperf"
+#line 120 "strings_ru.gperf"
       {"Erev Rosh Hashana","Вечер Рош-А-Шана"},
       {""}, {""},
-#line 55 "strings_ru.gperf"
+#line 56 "strings_ru.gperf"
       {"Behar","Бе-ар"},
-#line 135 "strings_ru.gperf"
+#line 136 "strings_ru.gperf"
       {"Pesach V (CH''M)","Пятый день Пэсах, Холь Амоэд"},
-#line 61 "strings_ru.gperf"
+#line 62 "strings_ru.gperf"
       {"Devarim","Дварим"},
-#line 125 "strings_ru.gperf"
+#line 126 "strings_ru.gperf"
       {"Havdalah","Авдала"},
       {""},
-#line 76 "strings_ru.gperf"
+#line 77 "strings_ru.gperf"
       {"Nasso","Насо"},
       {""},
 #line 23 "strings_ru.gperf"
       {"Nedarim","Недарим"},
-#line 190 "strings_ru.gperf"
+#line 192 "strings_ru.gperf"
       {"Tzom Gedaliah","Пост Гедальи"},
       {""},
-#line 103 "strings_ru.gperf"
+#line 104 "strings_ru.gperf"
       {"Yitro","Итро"},
-#line 149 "strings_ru.gperf"
+#line 151 "strings_ru.gperf"
       {"Kislev","Кислев"},
-#line 159 "strings_ru.gperf"
+#line 161 "strings_ru.gperf"
       {"Shabbat HaChodesh","Шаббат Месяца"},
-#line 52 "strings_ru.gperf"
+#line 53 "strings_ru.gperf"
       {"Bamidbar","Бамидбар"},
       {""},
-#line 101 "strings_ru.gperf"
+#line 102 "strings_ru.gperf"
       {"Vayishlach","Ваишлах"},
 #line 47 "strings_ru.gperf"
       {"Niddah","Нида"},
 #line 38 "strings_ru.gperf"
       {"Chullin","Хулин"},
       {""}, {""},
-#line 118 "strings_ru.gperf"
+#line 119 "strings_ru.gperf"
       {"Erev Purim","Вечер Пурима"},
-#line 84 "strings_ru.gperf"
+#line 85 "strings_ru.gperf"
       {"Shmini","Шмини"},
 #line 35 "strings_ru.gperf"
       {"Horayot","Орайот"},
-#line 65 "strings_ru.gperf"
+#line 66 "strings_ru.gperf"
       {"Kedoshim","Кдошим"},
       {""},
-#line 124 "strings_ru.gperf"
+#line 125 "strings_ru.gperf"
       {"Erev Yom Kippur","Вечер Дня Раскаяния"},
       {""},
-#line 68 "strings_ru.gperf"
+#line 69 "strings_ru.gperf"
       {"Ki Tisa","Ки Тиса"},
       {""}, {""},
-#line 160 "strings_ru.gperf"
+#line 162 "strings_ru.gperf"
       {"Shabbat HaGadol","Большой Шаббат"},
-#line 117 "strings_ru.gperf"
+#line 118 "strings_ru.gperf"
       {"Erev Pesach","Вечер Пэсаха"},
-#line 155 "strings_ru.gperf"
+#line 157 "strings_ru.gperf"
       {"Rosh Hashana","Рош-А-Шана"},
-#line 121 "strings_ru.gperf"
+#line 122 "strings_ru.gperf"
       {"Erev Simchat Torah","Канун Симхат Тора"},
-#line 156 "strings_ru.gperf"
+#line 158 "strings_ru.gperf"
       {"Rosh Hashana I","Рош-А-Шана I"},
-#line 157 "strings_ru.gperf"
+#line 159 "strings_ru.gperf"
       {"Rosh Hashana II","Рош-А-Шана II"},
-#line 122 "strings_ru.gperf"
+#line 123 "strings_ru.gperf"
       {"Erev Sukkot","Вечер Суккота"},
-#line 100 "strings_ru.gperf"
+#line 101 "strings_ru.gperf"
       {"Vayikra","Ваикра"},
       {""}, {""},
-#line 78 "strings_ru.gperf"
+#line 79 "strings_ru.gperf"
       {"Noach","Ноах"},
-#line 140 "strings_ru.gperf"
+#line 141 "strings_ru.gperf"
       {"Purim Katan","Маленький Пурим"},
-#line 180 "strings_ru.gperf"
+#line 182 "strings_ru.gperf"
       {"Sukkot IV (CH''M)","Четвертый день Суккота (Холь Амоэд)"},
 #line 18 "strings_ru.gperf"
       {"Megillah","Свиток"},
 #line 14 "strings_ru.gperf"
       {"Yoma","Йома"},
-#line 153 "strings_ru.gperf"
+#line 155 "strings_ru.gperf"
       {"Tamuz","Тамуз"},
-#line 102 "strings_ru.gperf"
+#line 103 "strings_ru.gperf"
       {"Vezot Haberakhah","Везот Абраха"},
-#line 133 "strings_ru.gperf"
+#line 134 "strings_ru.gperf"
       {"Pesach IV (CH''M)","Четвертый день Пэсах, Холь Амоэд"},
       {""}, {""},
-#line 81 "strings_ru.gperf"
+#line 82 "strings_ru.gperf"
       {"Re'eh","Рэ-э"},
       {""},
 #line 16 "strings_ru.gperf"
@@ -435,137 +435,139 @@ hebcal_lookup_ru (register const char *s
       {""},
 #line 27 "strings_ru.gperf"
       {"Kiddushin","Кидушин"},
-#line 195 "strings_ru.gperf"
+#line 197 "strings_ru.gperf"
       {"Yom Kippur","День Раскаяния"},
-#line 86 "strings_ru.gperf"
+#line 87 "strings_ru.gperf"
       {"Tazria","Тазриа"},
 #line 21 "strings_ru.gperf"
       {"Yevamot","Евамот"},
       {""}, {""}, {""}, {""}, {""},
-#line 146 "strings_ru.gperf"
+#line 148 "strings_ru.gperf"
       {"Cheshvan","Хешван"},
-#line 95 "strings_ru.gperf"
+#line 96 "strings_ru.gperf"
       {"Vayeilech","Ваелех"},
       {""}, {""}, {""},
-#line 106 "strings_ru.gperf"
+#line 107 "strings_ru.gperf"
       {"Chanukah","Ханука"},
       {""},
-#line 51 "strings_ru.gperf"
+#line 52 "strings_ru.gperf"
       {"Balak","Балак"},
       {""}, {""}, {""}, {""},
 #line 28 "strings_ru.gperf"
       {"Baba Kamma","Баба Кама"},
       {""},
-#line 115 "strings_ru.gperf"
+#line 116 "strings_ru.gperf"
       {"Chanukah: 8th Day","Ханука: 8-ой День"},
-#line 107 "strings_ru.gperf"
+#line 108 "strings_ru.gperf"
       {"Chanukah: 1 Candle","Ханука: 1 Свеча"},
-#line 114 "strings_ru.gperf"
+#line 115 "strings_ru.gperf"
       {"Chanukah: 8 Candles","Ханука: 8 Свечей"},
       {""}, {""},
-#line 161 "strings_ru.gperf"
+#line 163 "strings_ru.gperf"
       {"Shabbat Machar Chodesh","Шаббат Перед Новомесячьем"},
-      {""},
-#line 158 "strings_ru.gperf"
+#line 49 "strings_ru.gperf"
+      {"Daf Yomi","Страница Дня"},
+#line 160 "strings_ru.gperf"
       {"Shabbat Chazon","Шаббат Хазон"},
-#line 126 "strings_ru.gperf"
+#line 127 "strings_ru.gperf"
       {"Lag BaOmer","Лаг Ба Омер"},
       {""}, {""}, {""},
-#line 113 "strings_ru.gperf"
+#line 114 "strings_ru.gperf"
       {"Chanukah: 7 Candles","Ханука: 7 Свечей"},
 #line 48 "strings_ru.gperf"
       {"Daf Yomi: %s %d","Страница Дня: %s %d"},
 #line 44 "strings_ru.gperf"
       {"Kinnim","Киним"},
       {""},
-#line 77 "strings_ru.gperf"
+#line 78 "strings_ru.gperf"
       {"Nitzavim","Ницавим"},
-#line 112 "strings_ru.gperf"
+#line 113 "strings_ru.gperf"
       {"Chanukah: 6 Candles","Ханука: 6 Свечей"},
 #line 26 "strings_ru.gperf"
       {"Gitin","Гитин"},
-#line 59 "strings_ru.gperf"
+#line 60 "strings_ru.gperf"
       {"Chayei Sara","Хаей Сара"},
-#line 120 "strings_ru.gperf"
-      {"Erev Shavuot","Вечер Шавуота"},
+#line 143 "strings_ru.gperf"
+      {"Rosh Chodesh","Новый Месяц"},
       {""},
-#line 111 "strings_ru.gperf"
+#line 112 "strings_ru.gperf"
       {"Chanukah: 5 Candles","Ханука: 5 Свечей"},
-#line 141 "strings_ru.gperf"
+#line 142 "strings_ru.gperf"
       {"Rosh Chodesh %s","Новый Месяц %s"},
       {""}, {""},
-#line 104 "strings_ru.gperf"
+#line 105 "strings_ru.gperf"
       {"Asara B'Tevet","Пост 10го Тевета"},
 #line 31 "strings_ru.gperf"
       {"Sanhedrin","Сангедрин"},
-#line 150 "strings_ru.gperf"
+#line 152 "strings_ru.gperf"
       {"Nisan","Нисан"},
       {""},
 #line 34 "strings_ru.gperf"
       {"Avodah Zarah","Авода зара"},
       {""},
-#line 185 "strings_ru.gperf"
+#line 187 "strings_ru.gperf"
       {"Ta'anit Esther","Пост Эстер"},
       {""}, {""}, {""},
-#line 93 "strings_ru.gperf"
+#line 94 "strings_ru.gperf"
       {"Vayakhel","Ваякгель"},
-#line 110 "strings_ru.gperf"
+#line 111 "strings_ru.gperf"
       {"Chanukah: 4 Candles","Ханука: 4 Свечи"},
 #line 24 "strings_ru.gperf"
       {"Nazir","Назир"},
       {""}, {""}, {""},
-#line 109 "strings_ru.gperf"
+#line 110 "strings_ru.gperf"
       {"Chanukah: 3 Candles","Ханука: 3 Свечи"},
       {""},
-#line 196 "strings_ru.gperf"
+#line 198 "strings_ru.gperf"
       {"Yom Yerushalayim","День Иерусалима"},
       {""},
-#line 99 "strings_ru.gperf"
+#line 100 "strings_ru.gperf"
       {"Vayigash","Ваигаш"},
-#line 108 "strings_ru.gperf"
+#line 109 "strings_ru.gperf"
       {"Chanukah: 2 Candles","Ханука: 2 Свечи"},
       {""}, {""}, {""}, {""}, {""},
-#line 50 "strings_ru.gperf"
+#line 51 "strings_ru.gperf"
       {"Achrei Mot","Ахарей Мот"},
 #line 29 "strings_ru.gperf"
       {"Baba Metzia","Баба Мециа"},
-      {""},
-#line 194 "strings_ru.gperf"
+#line 121 "strings_ru.gperf"
+      {"Erev Shavuot","Вечер Шавуота"},
+#line 196 "strings_ru.gperf"
       {"Yom HaZikaron","День Памяти"},
       {""}, {""}, {""}, {""},
-#line 127 "strings_ru.gperf"
+#line 128 "strings_ru.gperf"
       {"Leil Selichot","Ночь слихот"},
       {""}, {""}, {""}, {""}, {""},
-#line 171 "strings_ru.gperf"
+#line 173 "strings_ru.gperf"
       {"Shmini Atzeret","Шмини Ацерет"},
       {""}, {""}, {""},
 #line 20 "strings_ru.gperf"
       {"Chagigah","Хагига"},
       {""}, {""}, {""}, {""},
-#line 64 "strings_ru.gperf"
+#line 65 "strings_ru.gperf"
       {"Ha'Azinu","А-Азину"},
       {""}, {""},
-#line 116 "strings_ru.gperf"
+#line 117 "strings_ru.gperf"
       {"Days of the Omer","Дней Омэра"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 67 "strings_ru.gperf"
+#line 68 "strings_ru.gperf"
       {"Ki Teitzei","Ки Теце"},
-#line 184 "strings_ru.gperf"
+#line 186 "strings_ru.gperf"
       {"Ta'anit Bechorot","Пост первенцев"},
-#line 54 "strings_ru.gperf"
+#line 55 "strings_ru.gperf"
       {"Beha'alotcha","Вегаалотха"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 193 "strings_ru.gperf"
+#line 195 "strings_ru.gperf"
       {"Yom HaShoah","День Катастрофы"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 191 "strings_ru.gperf"
+#line 193 "strings_ru.gperf"
       {"Tzom Tammuz","Пост Тамуза"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 192 "strings_ru.gperf"
+#line 194 "strings_ru.gperf"
       {"Yom HaAtzma'ut","День Независимости Израиля"},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -577,7 +579,7 @@ hebcal_lookup_ru (register const char *s
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 105 "strings_ru.gperf"
+#line 106 "strings_ru.gperf"
       {"Candle lighting","Зажигание свечей"}
     };
 
--- hebcal-4.20.orig/test-driver
+++ hebcal-4.20/test-driver
@@ -1,9 +1,9 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2013-07-13.22; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15
 # Test script is run here.
 "$@" >$log_file 2>&1
 estatus=$?
+
 if test $enable_hard_errors = no && test $estatus -eq 99; then
-  estatus=1
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
 fi
 
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
   0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
   0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
   77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
@@ -119,6 +122,12 @@ case $estatus:$expect_failure in
   *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
 esac
 
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"
 
@@ -131,9 +140,9 @@ echo ":copy-in-global-log: $gcopy" >> $t
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- hebcal-4.20.orig/tests/Makefile.in
+++ hebcal-4.20/tests/Makefile.in
@@ -437,6 +437,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- hebcal-4.20.orig/translations.h
+++ hebcal-4.20/translations.h
@@ -7,7 +7,7 @@
 
 #define HEBCAL_LANG_LIST "ashkenazi, ashkenazi_litvish, ashkenazi_poylish, ashkenazi_standard, fi, fr, he, hu, pl, ru"
 
-const char *hebcal_langs[11];
+extern const char *hebcal_langs[11];
 
 struct event_title { char *name; char *dest; };
 
