Bumped version number to 2.5.2

2016-02-24 23:41:59 +01:00
552 changed files with 34272 additions and 11747 deletions
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,12 +0,0 @@
 #### To report a bug...
 * What command(s) did you run?
 * What did you expect to happen?
 * What actually happened?
 * Paste the output of the ```task diag``` command.
 #### To request a feature...
 * Clearly describe the feature.
 * Clearly state the use case. We are only interested in use cases, do not waste time with implementation details or suggested syntax.
 * Please see our notes on [How to request a feature](https://taskwarrior.org/docs/features.html)
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,9 +0,0 @@
 #### Description
 Replace this text with a description of the PR.
 #### Additional information...
 - [ ] Have you run the test suite?
  Many changes need to be tested. Please run the test suite
  and include the output of ```cd test && ./problems```.
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,3 @@ CPackSourceConfig.cmake
 patches
 *.exe
 tutorials
 .prove
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
 [submodule "src/libshared"]
 	path = src/libshared
 	url = https://github.com/GothenburgBitFactory/libshared.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,49 +0,0 @@
 sudo: required
 language: generic
 matrix:
  include:
    - name: "Centos 7"
      os: linux
      env: CONTAINER=centos7
      services: docker
    - name: "Fedora 28"
      os: linux
      env: CONTAINER=fedora28
      services: docker
    - name: "Fedora 29"
      os: linux
      env: CONTAINER=fedora28
      services: docker
    - name: "Debian Stable"
      os: linux
      env: CONTAINER=debianstable
      services: docker
    - name: "Debian Testing"
      os: linux
      env: CONTAINER=debiantesting
      services: docker
    - name: "Ubuntu 16.04"
      os: linux
      env: CONTAINER=ubuntu1604
      services: docker
    - name: "Ubuntu 18.04"
      os: linux
      env: CONTAINER=ubuntu1804
      services: docker
    - name: "OpenSUSE 15.0"
      os: linux
      env: CONTAINER=opensuse1500
      services: docker
    - name: "Archlinux 2018.01.01"
      os: linux
      env: CONTAINER=arch180101
      services: docker
    - name: "Mac OS X 10.13"
      os: osx
      env: CONTAINER=osx
 install:
  # Build the docker container
  - pushd $TRAVIS_BUILD_DIR
  - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER ; fi
 script:
  - if [[ $CONTAINER != "osx" ]]; then docker-compose run test-$CONTAINER; else bash test/scripts/test_osx.sh ; fi
--- a/54
+++ b/54
@@ -126,33 +126,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
  Sunil Joshi
  Misty De Meo
  Kent R. Spillner
-  Konstantin Vorobyev
+  Konstantin
  Tom Sydney Kerckhove
  Lynoure Braakman
  Sebastien Badia
  Ran Benita
  Vladimir
  Zachary Manning
  jrabbit
  Jelle van der Waa
  Flavio Poletti
  Antonio Huete Jimenez
  Lukas Barth
  Øyvind A. Holm
  Paul J. Fenwick
  Michael Neumann
  Mark Scannell
  buhtz
  Tiago Matias
  Simon Ruderich
  Kirill Bobyrev
  Simon Désaulniers
  Janik Rabe
  mrossinek
  taiyu-len
  Lionel Miller
  Chad Phillips
  Lionel Miller
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -300,6 +274,7 @@ suggestions:
  James Cline
  Ryan
  Simon W. Jackson
  Sebastien Badia
  Michale Meier
  Svetoslav Trochev
  Marc Cornellà
@@ -313,28 +288,3 @@ suggestions:
  pawprint
  Reg
  Yaroslav Molochko
  Michael Meier
  Slaven ʙanovic
  Ellington Santos
  george js
  E. Manuel Cerr'on Angeles
  Andrew
  bjonnh
  OKOMper
  eldios
  Eli
  Sergey Trofimov
  eezewaek
  Hubert Toullec
  Eric Hymowitz
  Dan Callahan
  Martin Strunz
  Kai HTML
  Marc Richter
  rjc
  php-coder
  Martin F. Krafft
  tom-doerr
  ad-si
  Adrien Lemaire
  Wray Zheng
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 2.8)
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 include (CheckFunctionExists)
 include (CheckStructHasMember)
@@ -8,14 +8,6 @@ set (HAVE_CMAKE true)
 project (task)
 set (PROJECT_VERSION "2.5.2")
 include (CXXSniffer)
 OPTION (ENABLE_WASM "Enable 'wasm' support" OFF)
 if (ENABLE_WASM)
  message ("Enabling WASM support.")
  set(CMAKE_EXECUTABLE_SUFFIX ".js")
 endif (ENABLE_WASM)
 OPTION (ENABLE_SYNC "Enable 'task sync' support" ON)
@@ -26,14 +18,81 @@ else (ENABLE_SYNC)
  message (WARNING "ENABLE_SYNC=OFF. Not building sync support.")
 endif (ENABLE_SYNC)
-message ("-- Looking for libshared")
+message ("CMAKE_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}")
-if (EXISTS ${CMAKE_SOURCE_DIR}/src/libshared/.git)
+
-  message ("-- Found libshared")
+include (CheckCXXCompilerFlag)
-else (EXISTS ${CMAKE_SOURCE_DIR}/src/libshared/.git)
+
-  message ("-- Cloning libshared")
+# NOTE: If we are to actually use C++11 features, we should either require
-  execute_process (COMMAND git submodule update --init
+#       a compiler that supports the -std=c++11 flag or check for the
-                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+#       features used.
-endif (EXISTS ${CMAKE_SOURCE_DIR}/src/libshared/.git)
+#       Relying on -std=c++0x or even -std=gnu++0x is highly volatile.
 CHECK_CXX_COMPILER_FLAG("-std=c++11" _HAS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" _HAS_CXX0X)
 CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" _HAS_GNU0X)
 if (_HAS_CXX11)
  set (_CXX11_FLAGS "-std=c++11")
 elseif (_HAS_CXX0X)
  message (WARNING "Enabling -std=c++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option.  Consider upgrading.")
  set (_CXX11_FLAGS "-std=c++0x")
 elseif (_HAS_GNU0X)
  message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.")
  set (_CXX11_FLAGS "-std=gnu++0x")
 else (_HAS_CXX11)
 message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
 endif (_HAS_CXX11)
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
  set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
 endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (LINUX true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set (DARWIN true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
  set (KFREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
  set (FREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
  set (OPENBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
  set (NETBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
  set (SOLARIS true)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
  set (GNUHURD true)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
  set (CYGWIN true)
  # NOTE: Not setting -std=gnu++0x leads to compile errors even with
  #       GCC 4.8.3, and debugging those leads to insanity. Adding this
  #       workaround instead of fixing Cygwin.
  set (_CXX11_FLAGS "-std=gnu++0x")
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 set (CMAKE_CXX_FLAGS "${_CXX11_FLAGS} ${CMAKE_CXX_FLAGS}")
 set (CMAKE_CXX_FLAGS "-Wall -Wsign-compare -Wreturn-type ${CMAKE_CXX_FLAGS}")
 if (NETBSD)
   # Since readline, etc likely to be in /usr/pkg/lib, not standard library
   # Otherwise will remove links during install
   set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif (NETBSD)
 if (FREEBSD)
 SET (TASK_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5")
 else (FREEBSD)
 SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
 endif (FREEBSD)
 SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
 SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files")
 SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
 message ("-- Looking for SHA1 references")
 if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
@@ -48,23 +107,12 @@ endif (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
 set (PACKAGE "${PROJECT_NAME}")
 set (VERSION "${PROJECT_VERSION}")
-set (PACKAGE_BUGREPORT "support@gothenburgbitfactory.org")
+set (PACKAGE_BUGREPORT "support@taskwarrior.org")
 set (PACKAGE_NAME "${PACKAGE}")
 set (PACKAGE_TARNAME "${PACKAGE}")
 set (PACKAGE_VERSION "${VERSION}")
 set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
 if (FREEBSD OR DRAGONFLY)
 SET (TASK_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5")
 else (FREEBSD OR DRAGONFLY)
 SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
 SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
 endif (FREEBSD OR DRAGONFLY)
 SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
 SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files")
 SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
 if (USE_GNUTLS)
   message ("-- Looking for GnuTLS")
   find_package (GnuTLS)
@@ -111,25 +159,22 @@ else (HAVE_UUID_UNPARSE_LOWER)
  message ("-- Found libuuid, using internal uuid_unparse_lower")
 endif (HAVE_UUID_UNPARSE_LOWER)
-if (SOLARIS)
+# Set the package language.
-  # accept() is in libsocket according to its manpage
+if (LANGUAGE)
-  message("-- Looking for libsocket")
+  set (PACKAGE_LANGUAGE ${LANGUAGE})
-  find_library (SOCKET_LIBRARY NAMES socket)
+else (LANGUAGE)
-  if (SOCKET_LIBRARY)
+  set (PACKAGE_LANGUAGE 1)
-    set (TASK_LIBRARIES    ${TASK_LIBRARIES} ${SOCKET_LIBRARY})
+endif (LANGUAGE)
  else (SOCKET_LIBRARY)
    message(FATAL_ERROR "-- libsocket not found.")
  endif (SOCKET_LIBRARY)
-  # inet_ntop() is in libnsl according to its manpage
+set (LANGUAGE_ENG_USA 1)
-  message("-- Looking for libnsl")
+set (LANGUAGE_ESP_ESP 2)
-  find_library (NSL_LIBRARY NAMES nsl)
+set (LANGUAGE_DEU_DEU 3)
-  if (NSL_LIBRARY)
+set (LANGUAGE_FRA_FRA 4)
-    set (TASK_LIBRARIES    ${TASK_LIBRARIES} ${NSL_LIBRARY})
+set (LANGUAGE_ITA_ITA 5)
-  else (NSL_LIBRARY)
+set (LANGUAGE_POR_PRT 6)
-    message(FATAL_ERROR "-- libnsl not found.")
+set (LANGUAGE_EPO_RUS 7)
-  endif (NSL_LIBRARY)
+set (LANGUAGE_POL_POL 8)
-endif (SOLARIS)
+set (LANGUAGE_JPN_JPN 9)
 message ("-- Configuring cmake.h")
 configure_file (
@@ -161,5 +206,5 @@ set (CPACK_SOURCE_IGNORE_FILES  "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSo
                                "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$"
                                "test" "package-config" "misc/*" "src/task$" "src/calc$" "performance"
                                "src/libtask.a" "src/columns/libcolumns.a" "src/commands/libcommands.a"
-                                ".github/" ".travis.yml" "/\\\\.gitignore" "/\\\\.git/" "swp$" "src/lex$")
+                                "/\\\\.gitignore" "/\\\\.git/" "swp$" "src/lex$")
 include (CPack)
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
-Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,4 +20,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-https://www.opensource.org/licenses/mit-license.php
+http://www.opensource.org/licenses/mit-license.php
--- a/178
+++ b/178
@@ -1,159 +1,3 @@
 2.5.2 () -
 - TD-64   sync conflict deleted all annotations of the task
          Thanks to Markus Beppler, Konstantin Vorobyev
 - TI-91   Timewarrior does not compile on DragonFly
          Thanks to Michael Neumann
 - TW #1 URL formating
           Thanks to buhtz
 - TW #2 Update to markdown and rename DEVELOPER to DEVELOPER.md
           Thanks to Lynoure Braakman
 - TW-54/#115 Reduce output for timesheet
          Thanks to Aikido guy
 - TW-61   Extract only tasks with annotations
          Thanks to Aikido Guy
 - TW-213  Align countdown column on boundary between number and text.
          Thanks to Eric Fluger
 - TW-1572 Alternative approach to urgency inheritance
          Thanks to Jens Erat, Wim Schuermann
 - TW-1667 hooks: upon failure indicate which hook failed
          Thanks to Daniel Shahaf
 - TW-1785 Purge command to remove deleted tasks
          Thanks to Paul Beckingham
 - TW-1772 Implementation of circular dependency detection is inefficient
          Thanks to Michael Meier
 - TW-1778 Unicode strings are truncated in task description
          Thanks to Andrew, bjonnh, OKOMPer, Vladimir
 - TW-1788 Closing a reopened task does not update the end time
          Thanks to Ralph Bean
 - TW-1791 taskrc(5) manpage: spurious "pri." in rule.precedence.color
          Thanks to Sebastien Badia
 - TW-1792 The info command uses '0' to reference dependencies on non-
          pending tasks.
 - TW-1795 Calendar underline on Day padding
          Thanks to Renato Alves
 - TW-1805 project:ide is not allowed
          Thanks to Slaven ʙanovic
 - TW-1807 dateformat lacks a flag to display day of week
          Thanks to Ellington Santos
 - TW-1813 Range filter doesn't work
          Thanks to george js
 - TW-1820 Install with -DLANGUAGE=2 flag not work.
          Thanks to E. Manuel Cerr'on Angeles
 - TW-1823 Incorrect unicode text wrapping / justifying.
          Thanks to Sergey Trofimov
 - TW-1827 Extract annotations from a task
          Thanks to Ryan
 - TW-1855 "Well-known" CA certificates not properly auto-loaded
          Thanks to Flavio Poletti
 - TW-1857 Change Task::get call to the more efficient Task::has
          Thanks to Zachary Manning
 - TW‐1858 Change signature for dependencyGetBlocked
 - TW-1859 Change signature of Task::getTags
 - TW-1860 Change signature of Task::getAnnotations
 - TW-1861 Truncated description when adding annotation
          Thanks to eezewaek
 - TW-1869 segmentation fault (on unusual installation)
          Thanks to Eric Hymowitz
 - TW-1873 Specify different path to extensions/hooks directory
          Thanks to Eli
 - TW-1877 task done, task edit, task is now pending
          Thanks to Eric Hymowitz
 - TW-1878 uuids subcommand produces a space-delimited list, not comma-delimited
          Thanks to Scott Kostyshak
 - TW-1881 Missing last character(s) in Description field
          Thanks to Hubert Toullec
 - TW-1881 default.scheduled seems not to work
          Thanks to Onion
 - TW-1885 Task Sync does not send TLS SNI headers
          Thanks to Dan Callahan
 - TW-1903 grammar error -- There are 1 local changes.
          Thanks to Eric Hymowitz
 - TW-1906/#1919 sync sub-command is missing from task(1) manual page
          Thanks to rjc
 - TW-1910 unreachable statement
          Thanks to Martin Strunz
 - TW-1917/#1930 "above" does a string comparison, even when the value is numeric
          Thanks to Dirk Deimeke
 - TW-1930 Typo in help
          Thanks to Kai HTML
 - TW-1935 Separate verbosity category for rc overrides
          Thanks to Paul J. Fenwick
 - TW-1936 Tweak tests to have fuller TAP compliance
          Thanks to Paul J. Fenwick
 - TW-1938 Adjust behaviour of new-uuid and new-id verbosity levels
          Thanks to Paul J. Fenwick
 - TW-1947 "urgency.over" filter seems to not work correct
          Thanks to Marc Richter
 - TW #1964 task burndown shows extra brackets #1964
           Thanks to php-coder
 - TW #1966 Tests: Don't hardcode errno constants #1966
           Thanks to Jakub Wilk
 - TW #1973 Don't nag when no tasks are READY
           Thanks to Martin F. Krafft
 - TW #1986 [Nit] Update DEVELOPER.md after migration to Github
           Thanks to Kirill Bobyrev
 - TW #1922 Can't find export scripts
           Thanks to tom-doerr
 - TW #2020 reserved.lines is not affecting the burndown height
           Thanks to ad₋si
 - TW #2047 Exiting the task editor with an error code doesn't remove the lock file
           Thanks to coaxial
 - TW #2051 doc/man: ready tasks sorted with started tasks 1st
           Thanks to Simon Désaulniers
 - TW #2053 Do not set CMP0037 on CMake 3.11.0 and above
           Thanks to Janik Rabe
 - #2077    Change taskrc override priority, respect verbose override, refactor.
           Thanks to taiyu-len
 - #2108    CmdHistory: repeat unit if a larger unit changes
           Thanks to Janik Rabe
 - #2132    JSON encode/decode string UDAs
           Thanks to Chad Phillips
 - #2176    How to get the full list of tags ?
           Thanks to Adrien Lemaire
 - #2091    duration of task is set to a wrong and extremely big value
           Thanks to Wray Zheng
 - Added 'juhannus' as a synonym for 'midsommarafton'
           Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
  virtual tag.
 - Removed deprecated 'alias._query' setting.
 - Fixed ambiguity in the esp-ESP localization
           Thanks to Fidel Mato
 - Deprecated the 'new-uuid' verbosity option, since its functionality can be
  removed by merging with 'new-id'.
 - Correct a false-positive warning when a due date is removed and a wait is
  added.
 - Added 'QUARTER' virtual tag.
 - Fixed unquoted glob in bash completion script
           Thanks to Ran Benita
 - Deprecated use of alternate Boolean configuration settings. Use values "0" for
  off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
  "yes", "y", "no", "n".
 - Fixed test harness for Python 3.x.
           Thanks to jrabbit
 - Improved certificate validation diagnostics
           Thanks to Jelle van der Waa
 - Improved portability for SunOS-like OSes.
           Thanks to Antonio Huete Jimenez
 - Updated the 'timesheet' command with a more compact report that accepts a
  filter, and has a default filter showing the last four weeks of completed and
  started tasks.
 - Added 'history.weekly', 'history.daily', 'ghistory.weekly', 'ghistory.daily'
  report variations, with code refactoring.
          Thanks to Lukas Barth
 - New DOM references: annotations.count, tw.syncneeded, tw.program, tw.args,
  tw.width, tw.height, tw.version.
 - The message telling you to sync now indicates how many local changes will be
  synced.
 - Removed compile-time language settings and I18N.
 - Workaround for alias grep=rg in fish
          Thanks to Lionel Miller.
 - Do not set CMP0037 on CMake 3.11.0 and above
          Thanks to Janik Rabe
 ------ current release ---------------------------
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 - TD-104  Unrecognized taskwarrior file format
@@ -264,7 +108,7 @@
 - The 'run_all' script was not correctly using exit code 0 when all tests pass
          (thanks to Gordon Ball).
------ old releases ------------------------------
+------ current release ---------------------------
 2.5.0 (2015-10-21) dd5968a61b1fab258b38879cfdbb7d67f1bcd550
@@ -324,7 +168,7 @@
 - TW-1488 You have more urgent tasks (thanks to Stefan Betz, Denis Kasak).
 - TW-1496 Translation manuals are outdated/miss information (thanks to Jens
          Erat).
- TW-1499 Invalid due date produces jump to beginning of the unix epoch (thanks
+- TW-1499 Invalid due date produces jump to beggining of the unix epoch (thanks
          to Tomas Babej).
 - TW-1511 Project titles not properly parsed if they contain hyphens (thanks to
          Leon Feng, Blake Sweeney, Dylan Mikus).
@@ -378,7 +222,7 @@
          John Reeder).
 - TW-1630 "Due" parsing behavior seems inconsistent (thanks to Jim B).
 - TW-1632 Japanese translation for Taskwarrior(150713) (thanks to ribbon).
- TW-1634 due.not:<date> excludes only tasks scheduled at midnight (thanks to
+- TW-1634 due.not:<date> excludes only tasks scheduled at mitnight (thanks to
          Tomas Babej).
 - TW-1635 Running "task anystringatall" does not filter anything (thanks to
          Tomas Babej).
@@ -479,6 +323,8 @@
  added.
 - When GC is turned off, disable the query shortcuts, which no longer apply.
 ------ old releases ------------------------------
 2.4.4 (2015-05-10) df49aaba126484b668c41d3ff9301f8d8ec49987
 - TW-69   wait dates relative to due date (thanks to John Florian).
@@ -589,7 +435,7 @@
          Babej).
 - TW-1505 completely ignore mis-named hook scripts (thanks to Tomas Babej,
          David Patrick).
- TW-1509 Hooks modifications performed on sync not syncing back (thanks to
+- TW-1509 Hooks modifications performed on sync not sycning back (thanks to
          Tomas Babej).
 - TW-1510 Task can save empty value in the data backlog (thanks to Tomas Babej).
 - TW-1517 Hook performance should be measured individually for each hook (thanks
@@ -697,7 +543,7 @@
         "Description ( Information)".
 - TW-248 Substitute text doesn't work with forward slash (thanks to Jostein
         Berntsen).
- TW-249 Report filters don't allow parentheses (thanks to Philipp Woelfel).
+- TW-249 Report filters don't allow parantheses (thanks to Philipp Woelfel).
 - TW-250 Opening parenthesis in description gets padded in task 2.0.0 bet 2
         (thanks to Michelle Crane).
 - TW-251 extra spaces added after ( and / (thanks to Andy Spiegl).
@@ -972,7 +818,7 @@ Bugs
  .taskrc file (thanks to Haitham Gad).
 - #1247 Tests now create a local dir, rather than use the insecure /tmp dir
  (thanks to Jakub Wilk).
- #1248 Merge tests no longer connect to taskwarrior.org (thank to Jakub Wilk).
+- #1248 Merge tests no longer connect to takwarrior.org (thank to Jakub Wilk).
 - #1249 Build system now recognizes GNU/Hurd and GNU/kFreeBSD (thanks to Jakub
  Wilk).
 - #1263 The 'waiting' report properly lists only pending tasks with a wait date
@@ -1038,7 +884,7 @@ Features
 - Stop consider new tasks after quitting a bulk change.
 - Removed deprecated 'fg:' and 'bg:' attributes.
 - The 'diagnostics' command now reports libuuid details.
- New characters for parsing and formatting dates ('n', 's' and 'v').
+- New characters for parsing and formating dates ('n', 's' and 'v').
 - Virtual tags (BLOCKED, UNBLOCKED, BLOCKING, DUE, DUETODAY, OVERDUE, TODAY,
  ACTIVE, SCHEDULED, CHILD, UNTIL, WAITING and ANNOTATED).
 - New 'modified' attribute, which contains the most recent modification date,
@@ -1504,7 +1350,7 @@ Bugs
  Michelle Crane).
 - Fixed bug #823, so that recurring task change propagations are now always
  confirmed (thanks to Miguel de Val Borro).
- Fixed bug #824, which caused problems when completing recurring tasks (thanks
+- Fixed bug #824, which caused probles when completing recurring tasks (thanks
  to Matt Kraai).
 - Fixed bug #831, which prevented some date fields from being properly parsed.
 - Fixed bug #835, which prevented hierarchical projects from being recognized.
@@ -1583,7 +1429,7 @@ Bugs
  (thanks to Michal Vyskocil).
 - Fixed problem where update-holidays.pl did not properly handle UTF8 JSON
  data.
- Fixed problem where update-holidays.pl did not use the YYYYMMDD date format.
+- Fixed problem where update-holidays.pl did not use the YYYYMMDD date foramt.
 - Fixed problem where urgency was not properly calculated for waiting tasks.
 - Fixed problem where 'project' was not supported as a verbosity token (thanks
  to Adam Gibbins).
@@ -2097,7 +1943,7 @@ Bugs
 - Supports 'rc.name:value' for a command line override to .taskrc data
  (thanks to Federico Hernandez).
 - Removed obsolete DEVELOPERS file.  The online support forums at
-  https://taskwarrior.org will provide better information.
+  http://taskwarrior.org will provide better information.
 - Fixed bug that kept some deleted tasks showing up on the calendar report
  (thanks to Federico Hernandez).
 - Now asks the user to confirm large changes if configuration variable
--- a/168
+++ b/168
@@ -0,0 +1,168 @@
 How to Build Taskwarrior
  Satisfy the Requirements:
    - gcc 4.7 or later, clang 3.3 or later or equivalent. This is because C++11
      is now used.
    - libuuid
    - gnutls (optional)
    - python 2.7 or 3 (optional, for running the test suite)
  Obtain and build code:
    $ git clone https://git.tasktools.org/scm/tm/task.git task.git
    $ cd task.git
    $ git checkout 2.5.0                 # Latest dev branch
    $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither.
    $ make VERBOSE=1                     # Shows details
  Running Test Suite:
    $ cd tests
    $ make VERBOSE=1                     # Shows details
    $ ./run_all                          # Runs all tests silently > all.log
    $ ./problems                         # Enumerate test failures in all.log
  Note that any development should be performed using a git clone, and the
  current development branch. The source tarballs do not reflect HEAD, and do
  not contain the test suite.
  If you send a patch (support@taskwarrior.org), make sure that patch is made
  against git HEAD on the development branch. We cannot apply patches made
  against the tarball source, or master.
 General Statement
  This file is intended to convey the current efforts, priorities and needs of
  the codebase. It is for anyone looking for a way to start contributing.
  While this is biased towards developers, anyone can contribute, and everyone
  is encouraged to do so. Here are many ways to contribute that may not be
  immediately obvious to you:
  - Use Taskwarrior, become familiar with it, and make suggestions. There are
    always ongoing discussions about new features and changes to existing
    features.
  - Join us in the #taskwarrior IRC channel on freenode.net. Many great ideas,
    suggestions, testing and discussions have taken place there. It is also
    the quickest way to get help, or confirm a bug.
  - Join https://answers.tasktools.org and help us by asking, answering and
    voting on questions and answers, directly helping those who ask, and
    helping future users who search for existing answers.
  - Review documentation: there are man pages, online articles, tutorials and
    so on, and these may contain errors, or they may not convey ideas in the
    best way. Perhaps you can help improve it. Contact us - documentation is
    a separate effort from the codebase, and includes all web sites, and all
    are available using git.
  - Take a look at the bug database, and help triage the bug list. This is a
    review process that involves confirming bugs, providing additional data,
    information or analysis. Bug triage is very useful and much needed. You
    could check to see that an old bug is still relevant - sometimes they are
    not.
  - Review the source code, and point out inefficiencies, problems, unreadable
    functions, bugs and assumptions.
  - Fix a bug. For this you'll need C++ and Git skills, but this is one of
    the largest ways you can contribute. We welcome all bug fixes, provided
    the work is done well and doesn't create other problems or introduce new
    dependencies. We recommend talking to us before starting. Seriously.
  - Add unit tests. Unit tests are possibly the most useful contributions of
    all, because they not only improve the quality of the code, but prevent
    future regressions, therefore maintaining quality of subsequent releases.
    Plus, broken tests are a great motivator for us to fix the causal defect.
    You'll need Python skills.
  - Add a feature. Well, let's be very clear about this: adding a feature is
    not usually well-received, and if you add a feature and send a patch, it
    will most likely be rejected. The reason for this is that there are many
    efforts under way, in various code branches. There is a very good chance
    that the feature you add is either already in progress, or being done in a
    way that is more fitting when considering other work in progress. So if
    you want to add a feature, please don't. Start by talking to us, and find
    out what is currently under way or planned. You might find that we've
    already rejected such a feature for some very good reasons. So please
    check first, so we don't duplicate effort or waste anyone's time.
  - Donate some server time to the testing effort, by participating in the
    continuous integration of all changes, with our Flod software. See this
    page for an example:  http://central.tasktools.org. Ask us about running a
    Flod satellite, we're always looking for exotic platforms to test on.
  - Spread the word. Help others become more effective at managing tasks.
  - Encouragement. Tell us what works for you, and what doesn't. Tell us about
    your methodology for managing tasks. It's all useful information.
  - Request a feature. This not only tells us that you think something is
    missing from the software, but gives us insights into how you use it.
    Plus, you might get your feature implemented.
  Next are some specific areas that need attention.
 New Code Needs
  This is code that needs to be written.
  - Need an external script that can locate and correct duplicate UUIDs in the
    data file, as found by 'task diag'. This should check to see if there is
    a suitable UUID generator installed. This should also be careful to
    properly handle recurring tasks.
  - Take a look at:
      https://bug.tasktools.org/browse/EX
    This 'extension' release is a collection of all the requested features that
    lie outside of the core product, and will be implemented as external scripts
    by anyone who wishes to participate.
 Unit Tests Needed
  There are always more unit tests needed. More specifically, better unit tests
  are always needed. The convention is that there are four types of unit test:
  1. High level tests that exercise large features, or combinations of commands.
     For example, dependencies.t runs through a long list of commands that test
     dependencies, but do so by using 'add', 'modify', 'done' and 'delete'.
  2. Regression tests that ensure certain bugs are fixed and stay fixed. These
     tests are named bug.NNN.t where NNN refers to the bug number. While it is
     not worth creating tests for small fixes like typos, it is for changes to
     the logic.
  3. Small feature tests. When small features are added, we would like small,
     low-level feature tests named feature.t, with a descriptive name and
     focused tests.
  4. Code tests. These are tests written in C++ that exercise C++ objects, or
     function calls. These are the lowest level tests. It is important that
     these kind of tests be extensive and thorough, because the software depends
     on this code the most.
  The tests are written in Python, Bash and C++, and all use TAP.
  Tests needed:
  - Take a look at the bug database (https://bug.tasktools.org) and notice that
    many issues, open and closed, have the "needsTest" label. These are things
    that we would like to see in the test suite, as regression tests.
  - Test regex support.
  - Need unit tests for each bug in the issue list that is marked with the
    'needsTest' label.
  Note that all new unit tests should follow the test/template.t standard.
 Work in Progress
  Things that are currently in flux, which is another way of saying leave it
  alone while it is being worked on.
  - All columns/Col*::validate methods.
  - New columns/Col*::modify methods.
 Current Codebase Condition
  'master' branch:
    - 2.4.4 Current release, locked.
  '2.5.0' branch:
    - Current development branch no plans yet.
 ---
 2015-09-07 Updated for 2.5.0
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -1,157 +0,0 @@
 # How to Build Taskwarrior
 ## Satisfy the Requirements:
 * CMake 3.0 or later
 * gcc 5.0 or later, clang 3.4 or later, or a compiler with full C++14 support
 * libuuid (if not on macOS)
 * gnutls (optional)
 * python 2.7 or 3 (optional, for running the test suite)
 ## Obtain and build code:
 ```
    $ git clone --recursive https://github.com/GothenburgBitFactory/taskwarrior taskwarrior.git
    $ cd taskwarrior.git
    $ git checkout 2.6.0                 # Latest dev branch
    $ git submodule init                 # This is now done by cmake as a test
    $ git submodule update               # Update the libhsared.git submodule
    $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
    $ make VERBOSE=1 -j4                 # Shows details, builds using 4 jobs
                                         # Alternately 'export MAKEFLAGS=-j 4'
 ```
 ## Running Test Suite:
 ```
    $ cd tests
    $ make VERBOSE=1                     # Shows details
    $ ./run_all                          # Runs all tests silently > all.log
    $ ./problems                         # Enumerate test failures in all.log
 ```
  Note that any development should be performed using a git clone, and the
  current development branch. The source tarballs do not reflect HEAD, and do
  not contain the test suite.
  If you send a patch (support@gothenburgbitfactory.org), make sure that patch is made
  against git HEAD on the development branch. We cannot apply patches made
  against the tarball source, or master.
 # General Statement
  This file is intended to convey the current efforts, priorities and needs of
  the code base. It is for anyone looking for a way to start contributing.
  Here are many ways to contribute that may not be obvious:
  * Use Taskwarrior, become familiar with it, and make suggestions. There are
    always ongoing discussions about new features and changes to existing
    features.
  * Join us in the #taskwarrior IRC channel on freenode.net. Many great ideas,
    suggestions, testing and discussions have taken place there. It is also
    the quickest way to get help, or confirm a bug.
  * Review documentation: there are man pages, online articles, tutorials and
    so on, and these may contain errors, or they may not convey ideas in the
    best way. Perhaps you can help improve it. Contact us - documentation is
    a separate effort from the code base, and includes all web sites, and all
    are available as git repositories.
  * Take a look at the bug database, and help triage the bug list. This is a
    review process that involves confirming bugs, providing additional data,
    information or analysis. Bug triage is very useful and much needed. You
    could check to see that an old bug is still relevant - sometimes they are
    not.
  * Review the source code, and point out inefficiencies, problems, unreadable
    functions, bugs and assumptions.
  * Fix a bug. For this you'll need C++ and Git skills. We welcome all bug
    fixes, provided the work is done well and doesn't create other problems or
    introduce new dependencies. We recommend talking to us before starting.
    Seriously.
  * Add unit tests. Unit tests are possibly the most useful contributions of
    all, because they not only improve the quality of the code, but prevent
    future regressions, therefore maintaining quality of subsequent releases.
    Plus, broken tests are a great motivator for us to fix the causal defect.
    You'll need Python skills.
  * Add a feature. Well, let's be very clear about this: adding a feature is
    not usually well-received, and if you add a feature and send a patch, it
    will most likely be rejected. The reason for this is that there are many
    efforts under way, in various code branches. There is a very good chance
    that the feature you add is either already in progress, or being done in a
    way that is more fitting when considering other work in progress. So if
    you want to add a feature, please don't. Start by talking to us, and find
    out what is currently under way or planned. You might find that we've
    already rejected such a feature for some very good reasons. So please
    check first, so we don't duplicate effort or waste anyone's time.
  * Spread the word. Help others become more effective at managing tasks.
  * Encouragement. Tell us what works for you, and what doesn't. Tell us about
    your methodology for managing tasks. It's all useful information.
  * Request a feature. This not only tells us that you think something is
    missing from the software, but gives us insights into how you use it.
    Plus, you might get your feature implemented.
 # Unit Tests Needed
  There are always more unit tests needed. More specifically, better unit tests
  are always needed. The convention is that there are four types of unit test:
  1. High level tests that exercise large features, or combinations of commands.
     For example, dependencies.t runs through a long list of commands that test
     dependencies, but do so by using 'add', 'modify', 'done' and 'delete'.
  1. Regression tests that ensure certain bugs are fixed and stay fixed. These
     tests are named tw-NNNN.t where NNNN refers to the bug number. While it is
     not worth creating tests for small fixes like typos, it is for logic
     changes.
  1. Small feature tests. When small features are added, we would like small,
     low-level feature tests named feature.t, with a descriptive name and
     focused tests.
  1. Code tests. These are tests written in C++ that exercise C++ objects, or
     function calls. These are the lowest level tests. It is important that
     these kind of tests be extensive and thorough, because the software depends
     on this code the most.
  The tests are written in Python, Bash and C++, and all use TAP.
 ## Tests needed
  * Take a look at the bug database (https://github.com/GothenburgBitFactory/taskwarrior/issues)
    and notice that many issues, open and closed, have the "needsTest" label.
    These are things that we would like to see in the test suite, as regression
    tests.
  All new unit tests should follow the test/template.t standard.
 # Patches
  Patches are encouraged and welcomed. Either send a pull request on Github or
  email a patch to support@taskwarrior.org. A good patch:
    * Maintains the MIT license, and does not contain code lifted from other
      sources. You will have written 100% of the code in the patch, otherwise
      we cannot maintain the license.
    * Precisely addresses one issue only.
    * Doesn't break unit tests. This means yes, run the unit tests.
    * Doesn't introduce dependencies.
    * Is accompanied by new or updated unit tests, where appropriate.
    * Is accompanied by documentation changes, where appropriate.
    * Conforms to the prevailing coding standards - in other words, it should
      fit in with the existing code.
  A patch may be rejected for violating any of the above rules, and more.
  Bad patches may be accepted and modified depending on work load and mood. It
  is possible that a patch may be rejected because it conflicts in some way with
  plans or upcoming changes. Check with us first, before sinking time and effort
  into a patch.
 # Current Code Base Condition
 **'master' branch**:
 * 2.5.1 Current release, locked.
 **'2.6.0' branch**:
  * Current development branch.
 ---
 2018-05-13 Updated for 2.5.2
--- a/210
+++ b/210
@@ -0,0 +1,210 @@
 Startup
  On startup, main creates a global Context object, then calls the
  Context::initialize and Context::run methods.
  Context is a large object that holds all task information, both in terms of
  the task data, and intermediate run-time data. Having one global Context
  object means we don't have 50 global variables. Context is therefore just a
  big global bucket of data.
  Context::initialize sets up all the data and processes the command line. The
  initialization process is a big chicken-and-egg problem, because the command
  line depends on configuration (aliases) and the command line can force a
  reload of configuration (rc:foo). This is solved by look-ahead: the command
  line is scanned for 'rc:xxx' and 'rc.data.location:xxx' arguments, then later
  for overrides.
  The Context::run method handles all the debug output and exceptions. Its
  main purpose is to set up exception handling and call Context::dispatch.
 Command Line Parsing
  Command line parsing is difficult because of all the ambiguity. The solution
  is to make multiple passes over the command line. For example, the command
  determines whether subsequent arguments are interpreted as part of a filter or
  set of modifications.
  The CLI2 object is fed command line arguments, then through a succession of
  calls builds and annotates a parse tree.  To help with this, the Lexer is
  used to break up strings into tokens.
 Dispatch
  Dispatch is simple: once the command line is parsed, the command is used to
  look up a command object, then a call is made to the Command::execute method.
  Context stores an associative map of command object pointers indexed by a
  string. This means the 'done' string is an index to the CmdDone object that
  implements the functionality.
 Command Objects
  Every task command is implemented by a command object. The command object
  provides metadata, usage and one-line help in addition to the ::execute method
  that implements the command. The Command base class implements common
  functionality.
 Column Objects
  There is a 1:1 correspondence between attributes stored in the data files and
  the columns that may be reported. These are represented by column objects,
  which are responsible for validating input, measuring space needed according
  to various formats, and for rendering data for reports. There is a
  ColDescription object that inherits from a Column base class.
 TDB2
  The TDB2 object is a layered, transactioned I/O manager. Its purpose is to
  isolate code from file I/O, locking and parsing details. It is also
  responsible for minimizing reads, writes and parsing of data files.
  All input is assumed to be UTF8. All stored data is UTF8.
 GC
  Garbage Collection is the process that moves tasks between the pending.data
  and completed.data files. It is also responsible for waking tasks out of the
  wait state.
  Every command that displays task IDs will cause a GC to be run first, which
  minimizes the number of changes necessary to the task IDs. This means that
  when a report shows task IDs, those IDs will remain valid while subsequent
  write commands are issued. The next report run may show different IDs.
  Minimizing the size of pending.data is important for performance, because it
  is the file that is accessed most.
 Files
  The data files used are all kept in the rc.data.location directory, which
  defaults to ~/.task. The files are:
    pending.data
    completed.data
    undo.data
    backlog.data
  The pending.data file aspires to contain only pending, waiting and recurring
  tasks, but this is only correct after a GC, and before any tasks are modified.
  This file tends to be relatively stable in size, reflecting the length of the
  task list.
  The completed.data file accumulates data over time, and grows unbounded.
  The undo.data file accumulates changes over time, and grows unbounded. It
  provides all the necessary metadata to support the 'undo' command.
  The backlog.data file contains an accumulated set of changes that have not
  been transmitted to Taskserver. It grows unbounded between 'sync' commands.
 Filter
  A filter is simply a set of command line arguments, but is only a subset of
  the complete command line. These arguments are extracted from the parse tree
  according to whether the command found is a read or write command.
  There is a Filter::subset method for applying a filter to a set of tasks,
  yielding a result set. It does this by creating an expression from the
  parse tree using the Eval object, then evaluating the expression for each task,
  such that the result set contains only tasks for which the expression evaluates
  to Boolean true.
 Eval & Variant
  The Eval class evaluates expressions, provided in string form, using the
  Variant class to represent data elements. Variant implements all operators
  for all Variant types.
 Sorting
  Sorting is performed on a set of tasks. More specifically, the list that is
  sorted is a set of numeric indexes to tasks that are stored in a separate
  list. This minimizes the amount of data copying involved to just integers
  rather than Task objects, but at the expense of one level of indirection.
  Memory fragmentation is a bigger problem than the performance of vector
  indexing.
  The actual sorting is performed by std::stable_sort, but the compare function
  is custom.
 Render
  There are two rendering objects, ViewTask and ViewText. These both have the
  same tabular grid rendering capabilities. ViewText maintains a 2D vector of
  strings to contain the data to be rendered, so it is used for things like the
  help command output. ViewTask does not copy data, but assumes all data is
  stored externally in a vector of Tasks, which minimizes data copying.
  ViewTask contains projection data in the form of a set of Column objects that
  represent the X axis. The Y axis is represented by a vector of tasks.
  The rendering process is complex. It involves dynamically setting column
  widths based on (1) available terminal width, (2) the columns to be included
  in the output, (3) ability to wrap text for certain columns and (4) the size
  of the data to be rendered, which involves added complexity when UTF8 is used.
  The Column objects determine minimum width for a column and the maximum width
  which then allows ViewT* to make choices.
 Test Suite
  A strong and diverse test suite is critical to the successful release of any
  software. With the complex command set and its myriad permutations, a test
  suite is the only way to ensure quality levels, and guarantee that big changes
  are robust.
  It is intended that the test suite continues growing, mostly feature tests.
  The test are mostly written in Python. Some tests are written in C++ and all
  tests generate TAP output.
  There are currently about 8,000 unit tests, that take only a few seconds to
  run on a multi-core machine.
  Taskwarrior uses flod software to automate continuous integration across many
  platforms. Code changes are automatically detected, propagated, built and
  tested on a variety of participating platforms. Grid testing results are here:
    http://central.tasktools.org/
  When making code changes, it is important that the test suite be run to verify
  that functionality was not broken.
 Debugging
  The 'rc.debug=on' override provides the following additional information which
  is useful during debugging:
    - Timing of various components (used to generate the data for the charts at
      http://tasktools.org/performance).
    - Data load times.
    - Terminal size, color capabilities.
    - Command line parse tree.
    - TDB2 layer and I/O information.
  Additionally, there are other settings (see 'man taskrc' for full details) that
  may also be helpful: 'rc.hooks=on|off', 'rc.debug.parser=0|1|2|3',
  'rc.debug.hooks=0|1|2', 'rc.debug.tls=0|1|2|3...'.
 Patches
  Patches are encouraged and welcomed. Either attach them to the appropriate
  Jira issue, or send them to support@taskwarrior.org. A good patch:
    - Maintains the MIT license, and does not contain code lifted from other
      sources. You will have written 100% of the code in the patch, otherwise
      we cannot maintain the license.
    - Precisely addresses one issue only.
    - Doesn't break unit tests.
    - Doesn't introduce dependencies.
    - Is accompanied by unit tests, where appropriate, written in Python.
    - Is accompanied by documentation changes, where appropriate.
    - Conforms to the prevailing coding standards - in other words, it should
      fit right in with the existing code.
  A patch may be rejected for violating any of the above rules, and more.
  Bad patches may be accepted and modified depending on work load and mood. It
  is possible that a patch may be rejected because it conflicts in some way with
  plans or upcoming changes. Check with us first, before sinking time and effort
  into a patch.
 ---
--- a/45
+++ b/45
@@ -8,15 +8,15 @@ source.
 Dependencies
 ------------
-You will need the CMake 3.0+ build system installed in order to build Taskwarrior
+You will need the CMake build system installed in order to build Taskwarrior
-from source. More information on CMake can be obtained at https://cmake.org
+from source. More information on cmake can be obtained at http://cmake.org
 You will also need:
  - make
-You will need a C++ compiler that supports full C++14, which includes:
+You will need a C++ compiler that supports full C++11, which includes:
-  - gcc 5.0   (released 2013-12-23)
+  - gcc 4.7   (released 2012-03-23)
-  - clang 3.4 (released 2014-01-02)
+  - clang 3.3 (released 2013-01-07)
 You will need the following libraries:
  - libuuid (not needed for OSX)
@@ -103,6 +103,26 @@ In order to build Taskwarrior without "sync" support, call cmake with the
 and proceed as described in "Basic Installation".
 Localizations
 -------------
 To make use of a translation, specify a language number, as found in cmake.h:
  $ cmake -DLANGUAGE=2 .
 Currently the defined languages are:
  eng_USA 1
  esp_ESP 2
  deu_DEU 3
  fra_FRA 4
  ita_ITA 5
  por_PRT 6
  epo_RUS 7
  pol_POL 8
  jpn-JPN 9
 Uninstallation
 --------------
@@ -141,7 +161,7 @@ Darwin, 32bit
    cmake -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32 .
  See:
-    https://taskwarrior.org/issues/817
+    http://taskwarrior.org/issues/817
    http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
    http://stackoverflow.com/questions/2617508/cmake-gcc-cuda-and-m32-wtf
    http://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt
@@ -156,16 +176,8 @@ OpenBSD
  and build normally.
-  See: https://github.com/GothenburgBitFactory/taskwarrior/issues/1605
+  See: https://bug.tasktools.org/browse/TW-1579
 WASM
  Using the Emscripten compiler, you can achieve it like this:
    cmake -DCMAKE_CXX_COMPILER=emcc -DENABLE_SYNC=OFF -DCMAKE_BUILD_TYPE=release -DENABLE_WASM=ON \
          -DCMAKE_EXE_LINKER_FLAGS="-m32 -s NO_DYNAMIC_EXECUTION=1 -s WASM=1 -s NO_EXIT_RUNTIME=1 -s INVOKE_RUN=0" \
          -DCMAKE_CXX_FLAGS_RELEASE="-O2 -m32"
  This will produce an optimized WASM with a main() that is callable multiple times.
 Troubleshooting
 ---------------
@@ -180,7 +192,8 @@ CMake with no reported problems, and the build will fail later.  This is
 almost always because CMake is mistaken about some assumption.
 If a build does not succeed, please send the contents of the 'CMakeCache.txt'
-and 'CMakeFiles/CMakeOutput.log' files to support@gothenburgbitfactory.org.
+and 'CMakeFiles/CMakeOutput.log' files to support@taskwarrior.org, or post a
 message in the support forums at taskwarrior.org along with the information.
 If CMake runs but Taskwarrior does not build, please send the contents of the
 above files as well as a transcript from the build, which is not written to a
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
-Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,4 +20,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-https://www.opensource.org/licenses/mit-license.php
+http://www.opensource.org/licenses/mit-license.php
--- a/56
+++ b/56
@@ -1,48 +1,26 @@
-New Features in Taskwarrior 2.5.2
+New Features in Taskwarrior 2.5.1
-  - The 'QUARTER' virutal tag was added.
+  - As a bug-fix, code cleanup and performance release, new features are
    limited to only small tweaks.
  - The 'help' command now takes a 'usage' argument, which displays only the
    command usage.
  - Improved compatibility with SmartOS, OmniOS and OpenIndiana.
  - New DOM references: annotations.count, tw.syncneeded, tw.program, tw.args,
    tw.width, tw.height, tw.version.
  - Renovated 'timesheet' command with a more compact report that accepts a
    filter, and has a default filter showing the last four weeks of completed
    and started tasks.
  - The message telling you to sync now indicates how many local changes will be
    synced.
-New Commands in Taskwarrior 2.5.2
+New Commands in Taskwarrior 2.5.1
-  - The 'purge' command was added, which completely removes old tasks.
+  - None.
  - Added new 'history.weekly', 'history.daily', 'ghistory.weekly',
    'ghistory.daily' reports.
-New Configuration Options in Taskwarrior 2.5.2
+New Configuration Options in Taskwarrior 2.5.1
  - New 'relative' column format for 'date' type columns does what 'remaining'
    and 'countdown' do, but in one format.
  - The 'default.scheduled' date/duration works just like 'default.due'.
  - The 'report.timesheet.filter' setting controls the tasks shown by the
    'timesheet' command.
-Newly Deprecated Features in Taskwarrior 2.5.2
+Newly Deprecated Features in Taskwarrior 2.5.1
-  - The 'DUETODAY' virtual tag is a synonym for the 'TODAY' virtual tag, and is
+  -
    not needed.
  - The 'new-uuid' verbosity option is to be removed, as it is redundant, its
    functionality will be merged with 'new-id' option.
  - The use of alternate Boolean configuration settings is deprecated. Use values
    "0" for off, and "1" for on.  Avoid used of "on", "off", "true", "t",
    "false", "f", "yes", "y", "no", "n".
  - The 'context.program', 'context.args', 'context.width' and 'context.height'
    DOM references are deprecated, replaced by similarly-named 'tw.xxx'
    references.
-Removed Features in 2.5.2
+Removed Features in 2.5.1
  - Removed 'alias._query' default configuration.
  - There is no longer a 16-color default configuration for some platforms,
    making all platforms 256-color.
  - The configuration setting 'burndown.bias' is no longer used.
@@ -50,32 +28,34 @@ Removed Features in 2.5.2
    been replaced by something less icky. Estimates are now based on the net
    completion rate after the peak number of pending tasks.
  - The unused 'dom' and 'shell.prompt' configuration settings were removed.
  - Translations are no longer supported.
 Known Issues
-  - https://github.com/GothenburgBitFactory/taskwarrior
+  - https://bug.tasktools.org/
 Taskwarrior has been built and tested on the following configurations:
-  * macOS
+  * OS X
  * Fedora
  * Ubuntu
  * Debian
  * Arch
  * FreeBSD
-  * CentOS
+  * Cygwin
 ---
 While Taskwarrior has undergone testing, bugs are sure to remain.  If you
 encounter a bug, please enter a new issue at:
-  https://github.com/GothenburgBitFactory/taskwarrior<Paste>
+  https://bug.tasktools.org
 Or you can also report the issue in the forums at:
  https://answers.tasktools.org
 Or just send a message to:
-  support@GothenburgBitFactory.org
+  support@taskwarrior.org
 Thank you.
--- a/README.md
+++ b/README.md
@@ -1,90 +1,47 @@
-# Taskwarrior
+# Disclaimer during ongoing development
-[![Travis build status](https://travis-ci.org/GothenburgBitFactory/taskwarrior.svg?branch=2.5.2)](https://travis-ci.org/GothenburgBitFactory/taskwarrior)
+We want to discourage you from using the development version of Taskwarrior.
 The development branch is a work in progress and may not pass all quality tests,
 therefore it may harm your data. We do not guarantee proper or even adequate
 functionality, performance or timely fixes.
 We welcome bug reports from beta- and release-level software, but generally not
 development versions. If you are undaunted by this, please:
 - Make proper backups.
 - Expect broken and missing functionality.
 - Be aware that using the development branch involves risks.
 ---
 Thank you for taking a look at Taskwarrior!
 Taskwarrior is a GTD, todo list, task management, command line utility with a
 multitude of features. It is a portable, well supported and very active Open
-Source project.
+Source project. Taskwarrior has binary distributions, online documentation,
 demonstration movies, and you'll find all the details at:
-## Documentation
+    http://taskwarrior.org
 There is extensive online documentation.
 You'll find all the details at [taskwarrior.org/docs](https://taskwarrior.org/docs)
 At the site you'll find online documentation, downloads, news and more.
-## Support
+Your contributions are especially welcome. Whether it comes in the form of
 code patches, ideas, discussion, bug reports, encouragement or criticism, your
 input is needed.
-For support options, take a look at [taskwarrior.org/support](https://taskwarrior.org/support)
+For support options, take a look at:
-Please use pull requests, or alternately send your code patches to
+    http://taskwarrior.org/support
 [support@gothenburgbitfactory.org](mailto:support@gothenburgbitfactory.org)
-## Branching Model
+Please send your code patches to:
-We use the following branching model:
+    support@taskwarrior.org
-* `master` is the stable branch. Building from here is the same as building
+Consider joining bug.tasktools.org, answers.tasktools.org and participating in
-  from the latest tarball, or installing a binary package. No development is
+the future of Taskwarrior.
  done on the `master` branch.
-* `2.6.0` is the current development branch. All work is done here, and upon
+---
  release it will be merged to `master`. This development branch is not stable,
  may not even build or pass tests, and should be treated accordingly.
  Make backups.
 ## Installing
 There are many binary packages available, but to install from source requires:
 * git
 * cmake
 * make
 * C++ compiler, currently gcc 5.0+ or clang 3.4+ for full C++14 support
 Download the tarball, and expand it:
    $ curl -O https://taskwarrior.org/download/task-2.6.0.tar.gz
    $ tar xzf task-2.6.0.tar.gz
    $ cd task-2.6.0
 Or clone this repository:
    $ git clone --recursive -b 2.6.0 https://github.com/GothenburgBitFactory/taskwarrior.git
    $ cd taskwarrior
 In case of errors with libshared - URL pointing to git.tasktools.org in either .git/config or .gitmodules:
    $ sed -i 's/git.tasktools.org\/TM/github.com\/GothenburgBitFactory/' .git/config
    $ git submodule update
 or
    $ sed -i 's/git.tasktools.org\/TM/github.com\/GothenburgBitFactory/' .gitmodules
    $ git submodule init
    $ git submodule update
 Then build:
    $ cmake -DCMAKE_BUILD_TYPE=release .
    ...
    $ make
    ...
    [$ make test]
    ...
    $ sudo make install
 ## Contributing
 Your contributions are especially welcome.
 Whether it comes in the form of code patches, ideas, discussion, bug reports, encouragement or criticism, your input is needed.
 Visit [Github](https://github.com/GothenburgBitFactory/taskwarrior) and participate in the future of Taskwarrior.
 ## License
 Taskwarrior is released under the MIT license.
 For details check the [LICENSE](LICENSE) file.
 Taskwarrior is released under the MIT license. For details check the LICENSE
 file.
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -17,6 +17,18 @@
 /* Installation details */
 #define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}"
 /* Localization */
 #define PACKAGE_LANGUAGE ${PACKAGE_LANGUAGE}
 #define LANGUAGE_ENG_USA ${LANGUAGE_ENG_USA}
 #define LANGUAGE_ESP_ESP ${LANGUAGE_ESP_ESP}
 #define LANGUAGE_FRA_FRA ${LANGUAGE_FRA_FRA}
 #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU}
 #define LANGUAGE_ITA_ITA ${LANGUAGE_ITA_ITA}
 #define LANGUAGE_POR_PRT ${LANGUAGE_POR_PRT}
 #define LANGUAGE_EPO_RUS ${LANGUAGE_EPO_RUS}
 #define LANGUAGE_POL_POL ${LANGUAGE_POL_POL}
 #define LANGUAGE_JPN_JPN ${LANGUAGE_JPN_JPN}
 /* git information */
 #cmakedefine HAVE_COMMIT
@@ -31,7 +43,6 @@
 #cmakedefine FREEBSD
 #cmakedefine OPENBSD
 #cmakedefine NETBSD
 #cmakedefine DRAGONFLY
 #cmakedefine HAIKU
 #cmakedefine SOLARIS
 #cmakedefine KFREEBSD
--- a/cmake/CXXSniffer.cmake
+++ b/cmake/CXXSniffer.cmake
@@ -1,40 +0,0 @@
 message ("-- Configuring C++17")
 message ("-- System: ${CMAKE_SYSTEM_NAME}")
 include (CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++17"   _HAS_CXX17)
 if (_HAS_CXX17)
  set (_CXX14_FLAGS "-std=c++17")
 else (_HAS_CXX17)
 message (FATAL_ERROR "C++17 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@gothenburgbitfactory.org.")
 endif (_HAS_CXX17)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (LINUX true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set (DARWIN true)
  set (_CXX14_FLAGS "${_CXX14_FLAGS} -stdlib=libc++")
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
  set (KFREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
  set (FREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
  set (OPENBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
  set (NETBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
  set (DRAGONFLY true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
  set (SOLARIS true)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
  set (GNUHURD true)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
  set (CYGWIN true)
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 set (CMAKE_CXX_FLAGS "${_CXX14_FLAGS} ${CMAKE_CXX_FLAGS}")
 set (CMAKE_CXX_FLAGS "-Wall -Wextra -Wsign-compare -Wreturn-type ${CMAKE_CXX_FLAGS}")
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 2.8)
 message ("-- Configuring man pages")
 set (man_FILES task-color.5 task-sync.5 taskrc.5 task.1)
 foreach (man_FILE ${man_FILES})
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -3,6 +3,33 @@
 .SH NAME
 task-color \- A color tutorial for the Taskwarrior command line todo manager.
 .SH SETUP
 The first thing you need is a terminal program that supports color.  All
 terminal programs support color, but only a few support lots of colors.  First
 tell your terminal program to use color by specifying the TERM environment
 variable like this:
    TERM=xterm-color
 In this example, xterm-color is used - a common value, and one that doesn't
 require that you use xterm.  This works for most setups.  This setting belongs
 in your shell profile (~/.bash_profile, ~/.bashrc, ~/.cshrc etc, depending on
 which shell you use).  If this is a new setting, you will need to either run
 that profile script, or close and reopen the terminal window (which does the
 same thing).
 Now tell Taskwarrior that you want to use color.  This is the default for
 Taskwarrior, so the following step may be unnecessary.
    $ task config color on
 This command will make sure there is an entry in your ~/.taskrc file that looks
 like:
    color=on
 Now Taskwarrior is ready.
 .SH AUTOMATIC MONOCHROME
 It should be mentioned that Taskwarrior is aware of whether its output is going
 to a terminal, or to a file or through a pipe.  When Taskwarrior output goes to
@@ -222,10 +249,11 @@ variable 'rule.precedence.color', which by default contains:
    deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
 These are just the color rules with the 'color.' prefix removed.  The
-rule 'color.deleted' has the highest precedence, and 'color.uda.' the lowest.
+rule 'color.due.today' is the highest precedence, and 'color.deleted' is the lowest.
 The keyword rule shown here as 'keyword.' corresponds to a wildcard pattern,
-meaning 'color.keyword.*', or in other words all the keyword rules.
+meaning 'color.keyword.*', or in other words all the keyword rules.  Similarly
 for the 'color.tag.*' and 'color.project.*' rules.
 There is also 'color.project.none', 'color.tag.none' and 'color.pri.none' to
 specifically represent missing data.
@@ -285,34 +313,34 @@ You can also see how the theme will color the various tasks with the command:
    $ task color legend
 Better yet, create your own, and share it.  We will gladly host the theme file
-on <https://taskwarrior.org>.
+on <http://taskwarrior.org>.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2020 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
-https://www.opensource.org/licenses/mit-license.php for more information.
+http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
 .BR task-sync(5)
-For more information regarding Taskwarrior, see the following:
+For more information regarding Taskwarrior, the following may be referenced:
 .TP
 The official site at
-<https://taskwarrior.org>
+<http://taskwarrior.org>
 .TP
 The official code repository at
-<https://github.com/GothenburgBitFactory/taskwarrior>
+<https://git.tasktools.org/scm/tm/task.git>
 .TP
-You can contact the project by emailing
+You can contact the project by writing an email to
-<support@GothenburgBitFactory.org>
+<support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<https://github.com/GothenburgBitFactory/taskwarrior/issues>
+<http://taskwarrior.org>
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -5,8 +5,8 @@ task-sync \- A discussion and tutorial for the various task(1) data
 synchronization capabilities.
 .SH INTRODUCTION
-Taskwarrior has several sync options, both external and built in.  If you wish
+Taskwarrior has several sync options, external and internal.  If you wish to
-to sync your data, choose one method only; mixing methods is going to lead to
+sync your data, choose one method only; mixing methods is only going to lead to
 problems.  Each of the methods discussed have their own strengths.
 .SH ALTERNATIVES
@@ -14,15 +14,14 @@ There are three alternatives for syncing data, which are:
 1) Version control systems, such as git, hg, svn
 .br
-2) File sharing systems, such as DropBox, Google Drive
+2) File hosting systems, such as DropBox
 .br
 3) Using the Taskserver and the 'sync' command
 .SH OPTION 1: VERSION CONTROL SYSTEMS
 There are several good, distributed VCS systems (git, hg, ...) and centralized
-VCS systems (svn, cvs ...), and they all function in a similar fashion for our
+VCS systems (svn ...), and they function in a similar fashion for our purposes.
 purposes.
 Setup is straightforward.  You place your .task directory under revision
 control.  You then need to perform a regular commit/push/pull/update to make
@@ -45,8 +44,8 @@ Weaknesses:
  - You need to provide the mechanism for making sure copies are up to date
-.SH OPTION 2: FILE SHARING SERVICES
+.SH OPTION 2: FILE HOSTING SERVICES
-There are many file sharing services, such as DropBox, Amazon S3, Google Drive,
+There are many file hosting services, such as DropBox, Amazon S3, Google Drive,
 SkyDrive and more.  This technique involves storing your .task directory in a
 shared directory under the control of the file hosting services.
@@ -62,6 +61,8 @@ configuration variable like this:
    $ task config data.location /path/to/shared/directory
 Strengths:
 .br
  - Always secure
 .br
  - Good client support
 .br
@@ -75,7 +76,7 @@ Weaknesses:
 .SH OPTION 3: TASKSERVER
-The Taskserver was designed for this purpose to be secure, fast and conflict-
+The Taskserver was designed for this purpose to be secure, fast and conflict
 free, allowing data interchange between assorted Taskwarrior clients, and
 tolerant of network connectivity problems.
@@ -85,7 +86,7 @@ done on demand.
 Setup is a matter of creating an account on a Taskserver (see your Taskserver
 provider or operate your own - see
-https://taskwarrior.org/docs/taskserver/setup.html)
+http://taskwarrior.org/docs/server_setup.html)
 Once you have an account, you'll receive a certificate, key, and credentials.
 You'll need to put the certificate and key somewhere like this:
@@ -106,10 +107,16 @@ certificate, which means you will need one of the following additional entries:
    $ task config taskd.ca          ~/.task/ca.cert.pem
 The CA (Certificate Authority) will be used to verify the server certificate.
 Alternatively, you can override the cert verification process using:
    $ task config taskd.trust       'allow all'
 This is an insecure option that should be used with caution, because it directs
 Taskwarrior to trust any certificate.
 After setup, you run a one-time sync initialization, like this:
-    $ task sync init
+    $ task sync initialize
 This will make sure your client and the server are properly in sync to begin
 with.  From this point on, you never run the 'initialize' command again, just
@@ -123,20 +130,9 @@ nothing happens.  If you do not have connectivity, your task changes accumulate
 so that when you next run 'sync' with proper connectivity, the changes are
 properly handled, in the right order.
 If you run multiple clients that sync to the same server, you will need to run
 this command on your primary client (the one you use most often):
    $ task config recurrence on
 And on the other clients, run:
    $ task config recurrence off
 This protects you against the effects of a sync/duplication bug.
 Strengths:
 .br
-  - Secure communication
+  - Always secure
 .br
  - Minimal bandwidth
 .br
@@ -147,31 +143,31 @@ Weaknesses:
  - You need to manage your own server, or gain access to a hosted server.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2020 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
-https://www.opensource.org/licenses/mit-license.php for more information.
+http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
 .BR task-color(5),
-For more information regarding Taskwarrior, see the following:
+For more information regarding task, the following may be referenced:
 .TP
 The official site at
-<https://taskwarrior.org>
+<http://taskwarrior.org>
 .TP
 The official code repository at
-<https://github.com/GothenburgBitFactory/taskwarrior>
+<https://git.tasktools.org/scm/tm/task.git>
 .TP
-You can contact the project by emailing
+You can contact the project by writing an email to
-<support@GothenburgBitFactory.org>
+<support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
-Bugs in Taskwarrior may be reported to the issue-tracker at
+Bugs in task may be reported to the issue-tracker at
-<https://github.com/GothenburgBitFactory/taskwarrior/issues>
+<http://taskwarrior.org>
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -151,12 +151,12 @@ the specified month and year.  If the 'due' argument is provided, will show
 the starting month of the earliest due task.
 .TP
-.B task colors [<sample> | legend]
+.B task colors [sample | legend]
 Displays all possible colors, a named sample, or a legend containing all
 currently defined colors.
 .TP
-.B task columns [<substring>]
+.B task columns [substring]
 Displays all supported columns and formatting styles.  Useful when creating
 custom reports.  If a substring is provided, only matching column names are
 shown.
@@ -177,8 +177,8 @@ Displays only a count of tasks matching the filter.
 .B task <filter> export
 Exports all tasks in the JSON format.  Redirect the output to a file, if you
 wish to save it, or pipe it to another command or script to convert it to
-another format. You'll find these example scripts online at
+another format. The standard task release comes with a few example scripts,
-<https://taskwarrior.org/tools/>:
+such as:
  export-csv.pl
  export-sql.py
@@ -200,14 +200,6 @@ Shows a graphical report of task status by year.
 Shows a graphical report of task status by month.  Note that 'ghistory' is
 an alias to 'ghistory.monthly'.
 .TP
 .B task <filter> ghistory.weekly
 Shows a graphical report of task status by week.
 .TP
 .B task <filter> ghistory.daily
 Shows a graphical report of task status by day.
 .TP
 .B task help
 Shows the long usage text.
@@ -221,14 +213,6 @@ Shows a report of task history by year.
 Shows a report of task history by month.  Note that 'history' is
 an alias to 'history.monthly'.
 .TP
 .B task <filter> history.weekly
 Shows a report of task history by week.
 .TP
 .B task <filter> history.daily
 Shows a report of task history by day.
 .TP
 .B task <filter> ids
 Applies the filter then extracts only the task IDs and presents them as
@@ -247,8 +231,9 @@ This command is mainly of use to external scripts.
 .TP
 .B task <filter> uuids
 Applies the filter on all tasks (even deleted and completed tasks)
-then extracts only the task UUIDs and presents them as a space-separated list.
+then extracts only the task UUIDs and presents them as
-This is useful as input to a task command, to achieve this:
+a comma-separated list.  This is useful as input to a task command, to achieve
 this:
  task $(task project:Home status:completed uuids) modify status:pending
@@ -294,9 +279,9 @@ value.
 .TP
 .B task <filter> ready
-Shows a page of the most urgent ready tasks, sorted by urgency with started
+Shows a page of the most urgent ready tasks, sorted by urgency.  A ready task is
-tasks first. A ready task is one that is either unscheduled, or has a scheduled
+one that is either unscheduled, or has a scheduled date that is past and has no
-date that is past and has no wait date.
+wait date.
 .TP
 .B task <filter> oldest
@@ -391,14 +376,6 @@ Modifies the existing task with provided information.
 .B task <filter> prepend <mods>
 Prepends description text to an existing task.
 .TP
 .B task <filter> purge
 Permanently removes the specified tasks from the data files. Only
 tasks that are alredy deleted can be purged. This command has a
 local-only effect and changes introduced by it are not synced.
 Warning: causes permanent, non-revertible loss of data.
 .TP
 .B task <filter> start <mods>
 Marks the specified tasks as started.
@@ -431,7 +408,7 @@ Examples:
    2015-03-31T23:59:59
 .TP
-.B task config [<name> [<value> | '']]
+.B task config [name [value | '']]
 Add, modify and remove settings directly in the Taskwarrior configuration.
 This command either modifies the 'name' setting with a new value of 'value',
 or adds a new entry that is equivalent to 'name=value':
@@ -516,7 +493,7 @@ Lists all supported reports.  This includes the built-in reports, and any custom
 reports you have defined.
 .TP
-.B task show [all | <substring>]
+.B task show [all | substring]
 Shows all the current settings.  If a
 substring is specified just the settings containing that substring will be
 displayed.
@@ -529,25 +506,6 @@ Shows statistics of the tasks defined by the filter.
 .B task <filter> summary
 Shows a report of aggregated task status by project.
 .TP
 .B task sync [init]
 The sync command synchronizes data with the Taskserver, if configured.
 The init subcommand should only ever be run once, and only on one client, because
 it sends all data to the Taskserver. This allows all the subsequent sync commands
 to only send small deltas.
 Note: If you use multiple sync clients, make sure this setting (which is the default)
 is on your primary client:
  recurrence=on
 and on all other clients (this is not the default):
  recurrence=off
 This is a workaround to avoid a recurrence bug that duplicates recurring tasks.
 .TP
 .B task <filter> tags
 Show a list of all tags used. Any special tags used are highlighted. Note that
@@ -556,7 +514,7 @@ notation for other task metadata. It is an error to attempt to add or remove a
 virtual tag.
 .TP
-.B task timesheet [<weeks>]
+.B task timesheet [weeks]
 Shows a weekly report of tasks completed and started.
 .TP
@@ -604,7 +562,7 @@ by third-party applications.
 Reports a unique set of attribute values. For example, to see all the active
 projects:
-  task +PENDING _unique project
+  task +PENDING _unique projects
 .TP
 .B task <filter> _uuids
@@ -652,16 +610,10 @@ Accesses and displays the DOM reference(s).  Used to extract individual values
 from tasks, or the system.  Supported DOM references are:
  rc.<name>
-  tw.syncneeded
+  context.program
-  tw.program
+  context.args
-  tw.args
+  context.width
-  tw.width
+  context.height
  tw.height
  tw.version
  context.program    (Deprecated in 2.6.0)
  context.args       (Deprecated in 2.6.0)
  context.width      (Deprecated in 2.6.0)
  context.height     (Deprecated in 2.6.0)
  system.version
  system.os
  <id>.<attribute>
@@ -681,7 +633,7 @@ extracted by DOM references.
 For a full list of supported attribute-specific DOM references, consult
 the online documentation at:
-<https://taskwarrior.org/docs/dom.html>
+<http://taskwarrior.org/docs/dom.html>
 .SH ATTRIBUTES AND METADATA
@@ -722,6 +674,7 @@ are:
    COMPLETED    Matches if the task has completed status
    DELETED      Matches if the task has deleted status
    DUE          Matches if the task is due
    DUETODAY     Matches if the task is due today
    LATEST       Matches if the task is the newest added task
    MONTH        Matches if the task is due this month
    ORPHAN       Matches if the task has any orphaned UDA values
@@ -730,7 +683,6 @@ are:
    PENDING      Matches if the task has pending status
    PRIORITY     Matches if the task has a priority
    PROJECT      Matches if the task has a project
    QUARTER      Matches if the task is due this quarter
    READY        Matches if the task is actionable
    SCHEDULED    Matches if the task is scheduled
    TAGGED       Matches if the task has tags
@@ -828,13 +780,6 @@ Attribute modifiers improve filters.  Supported modifiers are:
 .B  noword
 .RE
 They can be applied to all regular attributes (see above) and the following
 calculated attributes:
 .RS
 \fBurgency\fR (or short \fBurg\fR)
 .RE
 For example:
 .RS
@@ -1095,8 +1040,6 @@ task ... due:pentecost
 task ... due:midsommar
 .br
 task ... due:midsommarafton
 .br
 task ... due:juhannus
 .RE
 .SS FREQUENCIES
@@ -1300,7 +1243,7 @@ the 'data.location' configuration setting of the task data directory.
 For examples please see the online documentation starting at
 .RS
-<https://taskwarrior.org/docs>
+<http://taskwarrior.org/docs>
 .RE
 Note that the online documentation can be more detailed and more current than
@@ -1332,10 +1275,10 @@ The file that contains the completed ("done") tasks.
 The file that contains information needed by the "undo" command.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2020 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
-https://www.opensource.org/licenses/mit-license.php for more information.
+http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR taskrc(5),
@@ -1346,17 +1289,18 @@ For more information regarding Taskwarrior, see the following:
 .TP
 The official site at
-<https://taskwarrior.org>
+<http://taskwarrior.org>
 .TP
 The official code repository at
-<https://github.com/GothenburgBitFactory/taskwarrior>
+<https://git.tasktools.org/scm/tm/task.git>
 .TP
 You can contact the project by emailing
-<support@GothenburgBitFactory.org>
+<support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<https://github.com/GothenburgBitFactory/taskwarrior/issues>
+<https://bug.tasktools.org/>
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -55,7 +55,7 @@ default, sample
 .I .taskrc
 file in the user's home directory.
-The .taskrc file follows a very simple syntax defining name/value pairs:
+The .taskrc file follows a very simply syntax defining name/value pairs:
 .RS
 <name> = <value>
@@ -68,8 +68,8 @@ The entry must be on a single line, no continuations.
 Values support UTF8 as well as JSON encoding, such as \\uNNNN.
 Note that Taskwarrior is flexible about the values used to represent Boolean
-items. You can use "1" to enable, anything else is interpreted as disabled.
+items. You can use "on", "yes", "y", "1" and "true".
-The values "on", "yes", "y" and "true" are currently supported but deprecated.
+Anything else means "off".
 .RS
 include <file>
@@ -181,37 +181,33 @@ shell meta character, which will be properly expanded.
 Note that the TASKDATA environment variable overrides this setting.
 .TP
-.B hooks.location=$HOME/.task/hooks
+.B locking=on
 This is a path to the hook scripts directory. By default it is ~/.task/hooks.
 .TP
 .B locking=1
 Determines whether to use file locking when accessing the pending.data and
-completed.data files. Defaults to "1". Solaris users who store the data
+completed.data files. Defaults to "on". Solaris users who store the data
-files on an NFS mount may need to set locking to "0". Note that there is
+files on an NFS mount may need to set locking to "off". Note that there is
-danger in setting this value to "0" - another program (or another instance of
+danger in setting this value to "off" - another program (or another instance of
 task) may write to the task.pending file at the same time.
 .TP
-.B gc=1
+.B gc=on
 Can be used to temporarily suspend garbage collection (gc), so that task IDs
 don't change. Note that this should be used in the form of a command line
-override (task rc.gc=0 ...), and not permanently used in the .taskrc file,
+override (task rc.gc=off ...), and not permanently used in the .taskrc file,
 as this significantly affects performance in the long term.
 .TP
-.B hooks=1
+.B hooks=on
 This master control switch enables hook script processing. The default value
-is '1', but certain extensions and environments may need to disable hooks.
+is 'on', but certain extensions and environments may need to disable hooks.
 .TP
-.B exit.on.missing.db=0
+.B exit.on.missing.db=no
-When set to '1' causes the program to exit if the database (~/.task or
+When set to 'yes' causes the program to exit if the database (~/.task or
-rc.data.location or TASKDATA override) is missing. Default value is '0'.
+rc.data.location or TASKDATA override) is missing. Default value is 'no'.
 .SS TERMINAL
 .TP
-.B detection=1
+.B detection=on
 Determines whether to use ioctl to establish the size of the window you are
 using, for text wrapping.
@@ -229,14 +225,14 @@ to 24. If set to 0, it is interpreted as infinite height. This is useful when re
 charts to a file for subsequent handling.
 .TP
-.B avoidlastcolumn=0
+.B avoidlastcolumn=no
 Causes the width of the terminal minus one to be used as the full width. This
 avoids placing color codes in the last column which can cause problems for
-Cygwin users. Default value is '0'.
+Cygwin users. Default value is 'no'.
 .TP
-.B hyphenate=1
+.B hyphenate=on
-Hyphenates lines when wrapping breaks occur mid-word. Default value is '1'.
+Hyphenates lines when wrapping breaks occur mid-word. Default value is 'on'.
 .TP
 .B editor=vi
@@ -254,9 +250,9 @@ prompt. This is only referenced when 'limit:page' is used.
 .SS MISCELLANEOUS
 .TP
-.B verbose=1|0|nothing|list...
+.B verbose=on|off|nothing|list...
-When set to "1" (the default), helpful explanatory comments are added to all
+When set to "on" (the default), helpful explanatory comments are added to all
-output from Taskwarrior. Setting this to "0" means that you would see regular
+output from Taskwarrior. Setting this to "off" means that you would see regular
 output.
 The special value "nothing" can be used to eliminate all optional output, which
@@ -267,8 +263,8 @@ Alternatively, you can specify a comma-separated list of verbosity tokens that
 control specific occasions when output is generated. This list may contain:
    blank      Inserts extra blank lines in output, for clarity
-    header     Messages that appear before report output (this includes .taskrc/.task overrides and the "[task next]" message)
+    header     Messages that appear before report output
-    footnote   Messages that appear after report output (mostly status messages and change descriptions)
+    footnote   Messages that appear after report output
    label      Column labels on tabular reports
    new-id     Provides feedback of any new task IDs
    new-uuid   Provides feedback of any new task UUIDs. Deprecated, to be
@@ -280,21 +276,19 @@ control specific occasions when output is generated. This list may contain:
    sync       Feedback about sync
    filter     Shows the filter used in the command
    unwait     Notification when a task leaves the 'waiting' state
    override   Notification when configuration options are overridden
    recur      Notification when a new recurring task instance is created
-"affected", "new-id", "new-uuid", "project", "unwait", "override" and "recur"
+"affected", "new-id", "new-uuid" "project" and "unwait" imply "footnote".
 imply "footnote".
-Note that the "1" setting is equivalent to all the tokens being specified,
+Note that the "on" setting is equivalent to all the tokens being specified,
 and the "nothing" setting is equivalent to none of the tokens being specified.
 Here are the shortcut equivalents:
    verbose=on
-    verbose=blank,header,footnote,label,new-id,affected,edit,special,project,sync,filter,unwait,override
+    verbose=blank,header,footnote,label,new-id,affected,edit,special,project,sync,filter,unwait
-    verbose=0
+    verbose=off
    verbose=blank,label,new-id,edit
    verbose=nothing
@@ -304,16 +298,16 @@ Those additional comments are sent to the standard error for header, footnote
 and project. The others are sent to standard output.
 .TP
-.B confirmation=1
+.B confirmation=yes
-May be "1" or "0", and determines whether Taskwarrior will ask for
+May be "yes" or "no", and determines whether Taskwarrior will ask for
 confirmation before deleting a task or performing the undo command. The default
-value is "1". Consider leaving this enabled, for safety.
+value is "yes". Consider leaving this setting as "yes", for safety.
 .TP
-.B allow.empty.filter=1
+.B allow.empty.filter=yes
 An empty filter combined with a write command is potentially a way to modify
 all tasks by mistake, and when this is detected, confirmation is required.
-Setting this to '0' means that it is an error to use a write command with no
+Setting this to 'no' means that it is an error to use a write command with no
 filter.
 .TP
@@ -350,47 +344,47 @@ Default value is: 'You have more urgent tasks'.
 It is a gentle reminder that you are contradicting your own urgency settings.
 .TP
-.B list.all.projects=0
+.B list.all.projects=no
-May be "1" or "0", and determines whether the 'projects' command lists all the project
+May be yes or no, and determines whether the 'projects' command lists all the project
 names you have used, or just the ones used in active tasks. The default value is
-"0".
+"no".
 .TP
-.B summary.all.projects=0
+.B summary.all.projects=no
-If set to "1", shows all projects in the summary report, even if there are no
+If set to yes, shows all projects in the summary report, even if there are no
-pending tasks.  The default value is "0".
+pending tasks.  The default value is "no".
 .TP
-.B complete.all.tags=1
+.B complete.all.tags=yes
-May be "1" or "0", and determines whether the tab completion scripts consider all
+May be yes or no, and determines whether the tab completion scripts consider all
 the tag names you have used, or just the ones used in active tasks. The default
-value is "0".
+value is "no".
 .TP
-.B list.all.tags=1
+.B list.all.tags=yes
-May be "1" or "0", and determines whether the 'tags' command lists all the tag
+May be yes or no, and determines whether the 'tags' command lists all the tag
 names you have used, or just the ones used in active tasks. The default value is
-"0".
+"no".
 .TP
-.B print.empty.columns=1
+.B print.empty.columns=no
-May be "1" or "0", and determines whether columns with no data for any task are
+May be yes or no, and determines whether columns with no data for any task are
-printed. Defaults to "0".
+printed. Defaults to no.
 .TP
-.B search.case.sensitive=1
+.B search.case.sensitive=yes
-May be "1" or "0", and determines whether keyword lookup and substitutions on the
+May be yes or no, and determines whether keyword lookup and substitutions on the
-description and annotations are done in a case sensitive way. Defaults to "1" on
+description and annotations are done in a case sensitive way. Defaults to yes on
-most platforms. Defaults to "0" on Cygwin due to older regex library problems with
+most platforms. Defaults to no on Cygwin due to older regex library problems with
 case-insensitivity.
 .TP
-.B regex=1
+.B regex=on
-Controls whether regular expression support is enabled. The default value is "1".
+Controls whether regular expression support is enabled. The default value is on.
 .TP
-.B xterm.title=1
+.B xterm.title=no
-Sets the xterm window title when reports are run. Defaults to "0".
+Sets the xterm window title when reports are run. Defaults to off.
 .TP
 .B expressions=infix|postfix
@@ -398,21 +392,21 @@ Sets a preference for infix expressions (1 + 2) or postfix expressions (1 2 +).
 Defaults to infix.
 .TP
-.B json.array=1
+.B json.array=on
 Determines whether the export command encloses the JSON output in '[...]' and
 adds ',' after each exported task object to create a properly-formed JSON
 array.
-With json.array=0, export writes raw JSON objects to STDOUT, one per line.
+With json.array=off, export writes raw JSON objects to STDOUT, one per line.
-Defaults to "1".
+Defaults to on.
 .TP
-.B json.depends.array=1
+.B json.depends.array=on
 Determines whether the export command encodes dependencies as an array of string
 UUIDs, or one comma-separated string.
-Defaults to "1".
+Defaults to on.
 .TP
-.B _forcecolor=1
+.B _forcecolor=no
 Taskwarrior shuts off color automatically when the output is not sent directly
 to a TTY. For example, this command:
@@ -428,8 +422,6 @@ $ task rc._forcecolor=yes list > file
 .RE
 .RE
 Defaults to "0".
 .TP
 .B active.indicator=*
 The character or string to show in the start.active column. Defaults to *.
@@ -447,13 +439,9 @@ The character or string to show in the depends.indicator column. Defaults to +.
 The character or string to show in the <uda>.indicator column. Defaults to U.
 .TP
-.B recurrence=1
+.B recurrence=yes
 Controls whether recurrence is enabled, and whether recurring tasks continue to
-generate new task instances. Defaults to "1".
+generate new task instances. Defaults to 'yes'.
 If you are syncing multiple clients, then it is advised that you set 'recurrence=1'
 on your primary client, and 'recurrence=0' on ALL other clients. This is a workaround
 for a duplication bug.
 .TP
 .B recurrence.confirmation=prompt
@@ -487,7 +475,7 @@ Minimum length of any abbreviated command/value. This means that "ve", "ver",
 Default is 2.
 .TP
-.B debug=0
+.B debug=off
 Taskwarrior has a debug mode that causes diagnostic output to be displayed.
 Typically this is not something anyone would want, but when reporting a bug,
 debug output can be useful. It can also help explain how the command line is
@@ -495,7 +483,7 @@ being parsed, but the information is displayed in a developer-friendly, not a
 user-friendly way.
 Turning debug on automatically sets debug.hooks=1, debug.parser=1 and debug.tls=2
-if they do not already have assigned values. Defaults to "0".
+if they do not already have assigned values.
 .TP
 .B debug.hooks=0
@@ -595,8 +583,6 @@ S  two-digit seconds,      for example 07 or 47
 J  three-digit Julian day, for example 023 or 365
 .br
 j  Julian day,             for example 23 or 365
 .br
 w  Week day,               for example 0 for Monday, 5 for Friday
 .RE
 .RE
@@ -659,8 +645,8 @@ field that is set. Otherwise, they are set to the corresponding values of
 .RE
 .TP
-.B date.iso=1
+.B date.iso=yes
-Enables ISO-8601 date support.  The default value is "1".
+Enables ISO-8601 date support.  The default value is "yes".
 .TP
 .B weekstart=Sunday
@@ -668,10 +654,10 @@ Determines the day a week starts. Valid values are Sunday or Monday only. The
 default value is "Sunday".
 .TP
-.B displayweeknumber=1
+.B displayweeknumber=yes
 Determines if week numbers are displayed when using the "task calendar" command.
 The week number is dependent on the day a week starts. The default value is
-"1".
+"yes".
 .TP
 .B due=7
@@ -680,11 +666,11 @@ considered due, and is colored accordingly. The default value is 7.
 .TP
 .B calendar.details=sparse
-If set to "full" running "task calendar" will display the details of tasks with
+If set to full running "task calendar" will display the details of tasks with
 due dates that fall into the calendar period. The corresponding days will be
-color-coded in the calendar. If set to "sparse" only the corresponding days will
+color-coded in the calendar. If set to sparse only the corresponding days will
 be color coded and no details will be displayed. The displaying of due dates
-with details is turned off by setting the variable to "none". The default value
+with details is turned off by setting the variable to none. The default value
 is "sparse".
 .TP
@@ -693,9 +679,9 @@ The report to run when displaying the details of tasks with due dates when
 running the "task calendar" command. The default value is "list".
 .TP
-.B calendar.offset=0
+.B calendar.offset=off
-If "1" the first month in the calendar report is effectively changed by the
+If "on" the first month in the calendar report is effectively changed by the
-offset value specified in calendar.offset.value. It defaults to "0".
+offset value specified in calendar.offset.value. It defaults to "off".
 .TP
 .B calendar.offset.value=-1
@@ -711,15 +697,15 @@ and no details on the holidays will be displayed. The displaying of holidays is
 turned off by setting the variable to none. The default value is "none".
 .TP
-.B calendar.legend=1
+.B calendar.legend=yes
-Determines whether the calendar legend is displayed. The default value is "1".
+Determines whether the calendar legend is displayed. The default value is "yes".
 .SS JOURNAL ENTRIES
 .TP
-.B journal.time=0
+.B journal.time=no
-May be "1" or "0", and determines whether the 'start' and 'stop' commands should
+May be yes or no, and determines whether the 'start' and 'stop' commands should
-record an annotation when being executed. The default value is "0". The text of
+record an annotation when being executed. The default value is "no". The text of
 the corresponding annotations is controlled by:
 .TP
@@ -733,9 +719,9 @@ The text of the annotation that is recorded when executing the stop command and
 having set journal.time.
 .TP
-.B journal.info=1
+.B journal.info=on
 When enabled, this setting causes a change log of each task to be displayed by
-the 'info' command. Default value is "1".
+the 'info' command. Default value is "on".
 .SS HOLIDAYS
 Holidays are entered either directly in the .taskrc file or via an include file
@@ -794,22 +780,22 @@ specified, Taskwarrior will only show as many that will fit.
 .SS DEPENDENCIES
 .TP
-.B dependency.reminder=1
+.B dependency.reminder=on
 Determines whether dependency chain violations generate reminders.
 .TP
-.B dependency.confirmation=1
+.B dependency.confirmation=yes
 Determines whether dependency chain repair requires confirmation.
 .SS COLOR CONTROLS
 .TP
-.B color=1
+.B color=on
-May be "1" or "0". Determines whether Taskwarrior uses color. When "0",
+May be "on" or "off". Determines whether Taskwarrior uses color. When "off",
 will use dashes (-----) to underline column headings.
 .TP
-.B fontunderline=1
+.B fontunderline=on
 Determines if font underlines or ASCII dashes should be used to underline
 headers, even when color is enabled.
 .RE
@@ -820,7 +806,7 @@ automatic coloring of that task. A list of valid colors, depending on your
 terminal, can be obtained by running the command:
 .RS
-.B task colors
+.B task color
 .RE
 .RS
@@ -892,11 +878,12 @@ desired. In such cases, use the following option to disable this behaviour:
 .RE
 .TP
-.B rule.color.merge=1
+.B rule.color.merge=yes
-Can be "1" or "0". When "0", disables merging of colors produced by
+Can be "yes" or "no". When "no", disables merging of colors produced by
 different color rules. Use if your color scheme produces unpleasing
 foreground and background combinations.
 See the task-color(5) man pages for color details.
 .RE
@@ -1069,7 +1056,7 @@ Colors the output of the sync command.
 .TP
 .B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,
 .B                       scheduled,keyword.,project.,tag.,uda.,recurring,
-.B                       tagged,completed,deleted
+.B                       pri.,tagged,completed,deleted
 .RS
 This setting specifies the precedence of the color rules, from highest to
 lowest. Note that the prefix 'color.' is omitted (for brevity), and that any
@@ -1162,7 +1149,7 @@ The coefficients reflect the relative importance of the various terms in the
 urgency calculation. These are default values, and may be modified to suit your
 preferences, but it is important that you carefully consider any modifications.
-.B urgency.inherit=0
+.B urgency.inherit=off
 .RS
 Not actually a coefficient. When enabled, blocking tasks inherit
 the highest urgency value found in the tasks they block. This is
@@ -1189,14 +1176,6 @@ Provides a default due date for the
 command, if you don't specify one. You can use a date, or a duration value which
 is assumed to be relative to 'now'. The default is blank.
 .TP
 .B
 default.scheduled=...
 Provides a default scheduled date for the
 .I task add
 command, if you don't specify one. You can use a date, or a duration value which
 is assumed to be relative to 'now'. The default is blank.
 .TP
 .B
 uda.<name>.default=...
@@ -1285,9 +1264,6 @@ will be presented in the order (if any) in which they are selected.
 This adds a filter to the report X so that only tasks matching the filter
 criteria are displayed in the generated report.
 There is a special case for 'report.timesheet.filter', which may be specified
 even though the 'timesheet' report is not very customizable.
 .TP
 .B report.X.dateformat
 This adds a dateformat to the report X that will be used by the "due date"
@@ -1512,12 +1488,12 @@ Default is "NORMAL". See GnuTLS documentation for full details.
 .RE
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2020 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
 This man page was originally written by Federico Hernandez.
 Taskwarrior is distributed under the MIT license. See
-https://www.opensource.org/licenses/mit-license.php for more information.
+http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
@@ -1528,17 +1504,18 @@ For more information regarding Taskwarrior, see the following:
 .TP
 The official site at
-<https://taskwarrior.org>
+<http://taskwarrior.org>
 .TP
 The official code repository at
-<https://github.com/GothenburgBitFactory/taskwarrior>
+<https://git.tasktools.org/scm/tm/task.git>
 .TP
 You can contact the project by emailing
-<support@GothenburgBitFactory.org>
+<support@taskwarrior.org>
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<https://github.com/GothenburgBitFactory/taskwarrior/issues>
+<https://bug.tasktools.org/>
--- a/doc/misc/themes/README
+++ b/doc/misc/themes/README
@@ -1,8 +1,5 @@
 Themes
 These scripts are a way to generate a little sample data, and show the color
 themes.  It is not intended for general use.
 To generate samples of themes, first execute the 'setup' script to generate the
 sample data.  Note that this data may need to be tweaked to include qualities
 that need to be illustrated in theme sample.
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/dark-gray-blue-256.theme
+++ b/doc/rc/dark-gray-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/holidays.be-BY.rc
+++ b/doc/rc/holidays.be-BY.rc
@@ -0,0 +1,69 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/be-BY/2015.json
 # http://holidata.net/be-BY/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.be-BY1.name=Новы Год
 holiday.be-BY1.date=20150101
 holiday.be-BY2.name=Раство Хрыстова(праваслаўнае)
 holiday.be-BY2.date=20150107
 holiday.be-BY3.name=Міжнародны жаночы дзень
 holiday.be-BY3.date=20150803
 holiday.be-BY4.name=Пасха(праваслаўная)
 holiday.be-BY4.date=20150420
 holiday.be-BY5.name=Радуніца
 holiday.be-BY5.date=20150421
 holiday.be-BY6.name=Свята працы
 holiday.be-BY6.date=20150501
 holiday.be-BY7.name=Дзень Перамогі
 holiday.be-BY7.date=20150509
 holiday.be-BY8.name=Дзень незалежнаці
 holiday.be-BY8.date=20150703
 holiday.be-BY9.name=Дзень Кастрычніцкай рэвалюцыі
 holiday.be-BY9.date=20151107
 holiday.be-BY10.name=Раство Хрыстова(у заходніх хрысціян)
 holiday.be-BY10.date=20151225
 holiday.be-BY11.name=Новы Год
 holiday.be-BY11.date=20160101
 holiday.be-BY12.name=Раство Хрыстова(праваслаўнае)
 holiday.be-BY12.date=20160107
 holiday.be-BY13.name=Міжнародны жаночы дзень
 holiday.be-BY13.date=20160803
 holiday.be-BY14.name=Пасха(праваслаўная)
 holiday.be-BY14.date=20160327
 holiday.be-BY15.name=Радуніца
 holiday.be-BY15.date=20160510
 holiday.be-BY16.name=Свята працы
 holiday.be-BY16.date=20160501
 holiday.be-BY17.name=Дзень Перамогі
 holiday.be-BY17.date=20160509
 holiday.be-BY18.name=Дзень незалежнаці
 holiday.be-BY18.date=20160703
 holiday.be-BY19.name=Дзень Кастрычніцкай рэвалюцыі
 holiday.be-BY19.date=20161107
 holiday.be-BY20.name=Раство Хрыстова(у заходніх хрысціян)
 holiday.be-BY20.date=20161225
--- a/doc/rc/holidays.cs-CZ.rc
+++ b/doc/rc/holidays.cs-CZ.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/cs-CZ/2020.json
+# http://holidata.net/cs-CZ/2015.json
-# https://holidata.net/cs-CZ/2021.json
+# http://holidata.net/cs-CZ/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,63 +23,59 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.cs-CZ1.name=Nový rok
-holiday.cs-CZ1.date=20200101
+holiday.cs-CZ1.date=20150101
-holiday.cs-CZ2.name=Den obnovy samostatného českého státu
+holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ2.date=20200101
+holiday.cs-CZ2.date=20150101
-holiday.cs-CZ3.name=Velký pátek
+holiday.cs-CZ3.name=Velikonoční pondělí
-holiday.cs-CZ3.date=20200410
+holiday.cs-CZ3.date=20150406
-holiday.cs-CZ4.name=Velikonoční pondělí
+holiday.cs-CZ4.name=Svátek práce
-holiday.cs-CZ4.date=20200413
+holiday.cs-CZ4.date=20150501
-holiday.cs-CZ5.name=Svátek práce
+holiday.cs-CZ5.name=Den vítězství
-holiday.cs-CZ5.date=20200501
+holiday.cs-CZ5.date=20150508
-holiday.cs-CZ6.name=Den vítězství
+holiday.cs-CZ6.name=Den slovanských věrozvěstů
-holiday.cs-CZ6.date=20200508
+holiday.cs-CZ6.date=20150705
-holiday.cs-CZ7.name=Den slovanských věrozvěstů Cyrila a Metoděje
+holiday.cs-CZ7.name=Den upálení mistra Jana Husa
-holiday.cs-CZ7.date=20200705
+holiday.cs-CZ7.date=20150706
-holiday.cs-CZ8.name=Den upálení mistra Jana Husa
+holiday.cs-CZ8.name=Den české státnosti
-holiday.cs-CZ8.date=20200706
+holiday.cs-CZ8.date=20150928
-holiday.cs-CZ9.name=Den české státnosti
+holiday.cs-CZ9.name=Den vzniku samostatného československého státu
-holiday.cs-CZ9.date=20200928
+holiday.cs-CZ9.date=20151028
-holiday.cs-CZ10.name=Den vzniku samostatného československého státu
+holiday.cs-CZ10.name=Den boje za svobodu a demokracii
-holiday.cs-CZ10.date=20201028
+holiday.cs-CZ10.date=20151117
-holiday.cs-CZ11.name=Den boje za svobodu a demokracii a Mezinárodní den studentstva
+holiday.cs-CZ11.name=Štědrý den
-holiday.cs-CZ11.date=20201117
+holiday.cs-CZ11.date=20151224
-holiday.cs-CZ12.name=Štědrý den
+holiday.cs-CZ12.name=1. svátek vánoční
-holiday.cs-CZ12.date=20201224
+holiday.cs-CZ12.date=20151225
-holiday.cs-CZ13.name=1. svátek vánoční
+holiday.cs-CZ13.name=2. svátek vánoční
-holiday.cs-CZ13.date=20201225
+holiday.cs-CZ13.date=20151226
-holiday.cs-CZ14.name=2. svátek vánoční
+holiday.cs-CZ14.name=Nový rok
-holiday.cs-CZ14.date=20201226
+holiday.cs-CZ14.date=20160101
-holiday.cs-CZ15.name=Nový rok
+holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ15.date=20210101
+holiday.cs-CZ15.date=20160101
-holiday.cs-CZ16.name=Den obnovy samostatného českého státu
+holiday.cs-CZ16.name=Velikonoční pondělí
-holiday.cs-CZ16.date=20210101
+holiday.cs-CZ16.date=20160328
-holiday.cs-CZ17.name=Velký pátek
+holiday.cs-CZ17.name=Svátek práce
-holiday.cs-CZ17.date=20210402
+holiday.cs-CZ17.date=20160501
-holiday.cs-CZ18.name=Velikonoční pondělí
+holiday.cs-CZ18.name=Den vítězství
-holiday.cs-CZ18.date=20210405
+holiday.cs-CZ18.date=20160508
-holiday.cs-CZ19.name=Svátek práce
+holiday.cs-CZ19.name=Den slovanských věrozvěstů
-holiday.cs-CZ19.date=20210501
+holiday.cs-CZ19.date=20160705
-holiday.cs-CZ20.name=Den vítězství
+holiday.cs-CZ20.name=Den upálení mistra Jana Husa
-holiday.cs-CZ20.date=20210508
+holiday.cs-CZ20.date=20160706
-holiday.cs-CZ21.name=Den slovanských věrozvěstů Cyrila a Metoděje
+holiday.cs-CZ21.name=Den české státnosti
-holiday.cs-CZ21.date=20210705
+holiday.cs-CZ21.date=20160928
-holiday.cs-CZ22.name=Den upálení mistra Jana Husa
+holiday.cs-CZ22.name=Den vzniku samostatného československého státu
-holiday.cs-CZ22.date=20210706
+holiday.cs-CZ22.date=20161028
-holiday.cs-CZ23.name=Den české státnosti
+holiday.cs-CZ23.name=Den boje za svobodu a demokracii
-holiday.cs-CZ23.date=20210928
+holiday.cs-CZ23.date=20161117
-holiday.cs-CZ24.name=Den vzniku samostatného československého státu
+holiday.cs-CZ24.name=Štědrý den
-holiday.cs-CZ24.date=20211028
+holiday.cs-CZ24.date=20161224
-holiday.cs-CZ25.name=Den boje za svobodu a demokracii a Mezinárodní den studentstva
+holiday.cs-CZ25.name=1. svátek vánoční
-holiday.cs-CZ25.date=20211117
+holiday.cs-CZ25.date=20161225
-holiday.cs-CZ26.name=Štědrý den
+holiday.cs-CZ26.name=2. svátek vánoční
-holiday.cs-CZ26.date=20211224
+holiday.cs-CZ26.date=20161226
 holiday.cs-CZ27.name=1. svátek vánoční
 holiday.cs-CZ27.date=20211225
 holiday.cs-CZ28.name=2. svátek vánoční
 holiday.cs-CZ28.date=20211226
--- a/doc/rc/holidays.da-DK.rc
+++ b/doc/rc/holidays.da-DK.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/da-DK/2020.json
+# http://holidata.net/da-DK/2015.json
-# https://holidata.net/da-DK/2021.json
+# http://holidata.net/da-DK/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,55 +23,51 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.da-DK1.name=Nytårsdag
-holiday.da-DK1.date=20200101
+holiday.da-DK1.date=20150101
 holiday.da-DK2.name=Skærtorsdag
-holiday.da-DK2.date=20200409
+holiday.da-DK2.date=20150402
 holiday.da-DK3.name=Langfredag
-holiday.da-DK3.date=20200410
+holiday.da-DK3.date=20150403
 holiday.da-DK4.name=Påskedag
-holiday.da-DK4.date=20200412
+holiday.da-DK4.date=20150405
 holiday.da-DK5.name=Anden påskedag
-holiday.da-DK5.date=20200413
+holiday.da-DK5.date=20150406
-holiday.da-DK6.name=Store bededag
+holiday.da-DK6.name=Kristi himmelfartsdag
-holiday.da-DK6.date=20200508
+holiday.da-DK6.date=20150514
-holiday.da-DK7.name=Kristi himmelfartsdag
+holiday.da-DK7.name=Pinsedag
-holiday.da-DK7.date=20200521
+holiday.da-DK7.date=20150524
-holiday.da-DK8.name=Pinsedag
+holiday.da-DK8.name=Anden pinsedag
-holiday.da-DK8.date=20200531
+holiday.da-DK8.date=20150525
-holiday.da-DK9.name=Anden pinsedag
+holiday.da-DK9.name=Grundlovsdag
-holiday.da-DK9.date=20200601
+holiday.da-DK9.date=20150605
-holiday.da-DK10.name=Grundlovsdag
+holiday.da-DK10.name=Juledag
-holiday.da-DK10.date=20200605
+holiday.da-DK10.date=20151225
-holiday.da-DK11.name=Juledag
+holiday.da-DK11.name=Anden juledag
-holiday.da-DK11.date=20201225
+holiday.da-DK11.date=20151226
-holiday.da-DK12.name=Anden juledag
+holiday.da-DK12.name=Nytårsdag
-holiday.da-DK12.date=20201226
+holiday.da-DK12.date=20160101
-holiday.da-DK13.name=Nytårsdag
+holiday.da-DK13.name=Skærtorsdag
-holiday.da-DK13.date=20210101
+holiday.da-DK13.date=20160324
-holiday.da-DK14.name=Skærtorsdag
+holiday.da-DK14.name=Langfredag
-holiday.da-DK14.date=20210401
+holiday.da-DK14.date=20160325
-holiday.da-DK15.name=Langfredag
+holiday.da-DK15.name=Påskedag
-holiday.da-DK15.date=20210402
+holiday.da-DK15.date=20160327
-holiday.da-DK16.name=Påskedag
+holiday.da-DK16.name=Anden påskedag
-holiday.da-DK16.date=20210404
+holiday.da-DK16.date=20160328
-holiday.da-DK17.name=Anden påskedag
+holiday.da-DK17.name=Kristi himmelfartsdag
-holiday.da-DK17.date=20210405
+holiday.da-DK17.date=20160505
-holiday.da-DK18.name=Store bededag
+holiday.da-DK18.name=Pinsedag
-holiday.da-DK18.date=20210430
+holiday.da-DK18.date=20160515
-holiday.da-DK19.name=Kristi himmelfartsdag
+holiday.da-DK19.name=Anden pinsedag
-holiday.da-DK19.date=20210513
+holiday.da-DK19.date=20160516
-holiday.da-DK20.name=Pinsedag
+holiday.da-DK20.name=Grundlovsdag
-holiday.da-DK20.date=20210523
+holiday.da-DK20.date=20160605
-holiday.da-DK21.name=Anden pinsedag
+holiday.da-DK21.name=Juledag
-holiday.da-DK21.date=20210524
+holiday.da-DK21.date=20161225
-holiday.da-DK22.name=Grundlovsdag
+holiday.da-DK22.name=Anden juledag
-holiday.da-DK22.date=20210605
+holiday.da-DK22.date=20161226
 holiday.da-DK23.name=Juledag
 holiday.da-DK23.date=20211225
 holiday.da-DK24.name=Anden juledag
 holiday.da-DK24.date=20211226
--- a/doc/rc/holidays.de-AT.rc
+++ b/doc/rc/holidays.de-AT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/de-AT/2020.json
+# http://holidata.net/de-AT/2015.json
-# https://holidata.net/de-AT/2021.json
+# http://holidata.net/de-AT/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,103 +23,103 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-AT1.name=Neujahr
-holiday.de-AT1.date=20200101
+holiday.de-AT1.date=20150101
-holiday.de-AT2.name=Heilige drei Könige
+holiday.de-AT2.name=Heilige drei KÃ¶nige
-holiday.de-AT2.date=20200106
+holiday.de-AT2.date=20150106
-holiday.de-AT3.name=Josef
+holiday.de-AT3.name=Josef (K, St, T, V)
-holiday.de-AT3.date=20200319
+holiday.de-AT3.date=20150319
 holiday.de-AT4.name=Karfreitag
-holiday.de-AT4.date=20200410
+holiday.de-AT4.date=20150403
 holiday.de-AT5.name=Ostersonntag
-holiday.de-AT5.date=20200412
+holiday.de-AT5.date=20150405
 holiday.de-AT6.name=Ostermontag
-holiday.de-AT6.date=20200413
+holiday.de-AT6.date=20150406
 holiday.de-AT7.name=Staatsfeiertag
-holiday.de-AT7.date=20200501
+holiday.de-AT7.date=20150501
-holiday.de-AT8.name=Florian
+holiday.de-AT8.name=Florian (O)
-holiday.de-AT8.date=20200504
+holiday.de-AT8.date=20150504
 holiday.de-AT9.name=Christi Himmelfahrt
-holiday.de-AT9.date=20200521
+holiday.de-AT9.date=20150514
 holiday.de-AT10.name=Pfingstsonntag
-holiday.de-AT10.date=20200531
+holiday.de-AT10.date=20150524
 holiday.de-AT11.name=Pfingstmontag
-holiday.de-AT11.date=20200601
+holiday.de-AT11.date=20150525
 holiday.de-AT12.name=Fronleichnam
-holiday.de-AT12.date=20200611
+holiday.de-AT12.date=20150604
 holiday.de-AT13.name=Mariä Himmelfahrt
-holiday.de-AT13.date=20200815
+holiday.de-AT13.date=20150815
-holiday.de-AT14.name=Rupert
+holiday.de-AT14.name=Rupert (S)
-holiday.de-AT14.date=20200924
+holiday.de-AT14.date=20150924
-holiday.de-AT15.name=Tag der Volksabstimmung
+holiday.de-AT15.name=Tag der Volksabstimmung (K)
-holiday.de-AT15.date=20201010
+holiday.de-AT15.date=20151010
 holiday.de-AT16.name=Nationalfeiertag
-holiday.de-AT16.date=20201026
+holiday.de-AT16.date=20151026
 holiday.de-AT17.name=Allerheiligen
-holiday.de-AT17.date=20201101
+holiday.de-AT17.date=20151101
-holiday.de-AT18.name=Martin
+holiday.de-AT18.name=Martin (B)
-holiday.de-AT18.date=20201111
+holiday.de-AT18.date=20151111
-holiday.de-AT19.name=Leopold
+holiday.de-AT19.name=Leopold (W, N)
-holiday.de-AT19.date=20201115
+holiday.de-AT19.date=20151115
 holiday.de-AT20.name=Mariä Empfängnis
-holiday.de-AT20.date=20201208
+holiday.de-AT20.date=20151208
 holiday.de-AT21.name=Heiliger Abend
-holiday.de-AT21.date=20201224
+holiday.de-AT21.date=20151224
 holiday.de-AT22.name=Christtag
-holiday.de-AT22.date=20201225
+holiday.de-AT22.date=20151225
 holiday.de-AT23.name=Stefanitag
-holiday.de-AT23.date=20201226
+holiday.de-AT23.date=20151226
 holiday.de-AT24.name=Silvester
-holiday.de-AT24.date=20201231
+holiday.de-AT24.date=20151231
 holiday.de-AT25.name=Neujahr
-holiday.de-AT25.date=20210101
+holiday.de-AT25.date=20160101
-holiday.de-AT26.name=Heilige drei Könige
+holiday.de-AT26.name=Heilige drei KÃ¶nige
-holiday.de-AT26.date=20210106
+holiday.de-AT26.date=20160106
-holiday.de-AT27.name=Josef
+holiday.de-AT27.name=Josef (K, St, T, V)
-holiday.de-AT27.date=20210319
+holiday.de-AT27.date=20160319
 holiday.de-AT28.name=Karfreitag
-holiday.de-AT28.date=20210402
+holiday.de-AT28.date=20160325
 holiday.de-AT29.name=Ostersonntag
-holiday.de-AT29.date=20210404
+holiday.de-AT29.date=20160327
 holiday.de-AT30.name=Ostermontag
-holiday.de-AT30.date=20210405
+holiday.de-AT30.date=20160328
 holiday.de-AT31.name=Staatsfeiertag
-holiday.de-AT31.date=20210501
+holiday.de-AT31.date=20160501
-holiday.de-AT32.name=Florian
+holiday.de-AT32.name=Florian (O)
-holiday.de-AT32.date=20210504
+holiday.de-AT32.date=20160504
 holiday.de-AT33.name=Christi Himmelfahrt
-holiday.de-AT33.date=20210513
+holiday.de-AT33.date=20160505
 holiday.de-AT34.name=Pfingstsonntag
-holiday.de-AT34.date=20210523
+holiday.de-AT34.date=20160515
 holiday.de-AT35.name=Pfingstmontag
-holiday.de-AT35.date=20210524
+holiday.de-AT35.date=20160516
 holiday.de-AT36.name=Fronleichnam
-holiday.de-AT36.date=20210603
+holiday.de-AT36.date=20160526
 holiday.de-AT37.name=Mariä Himmelfahrt
-holiday.de-AT37.date=20210815
+holiday.de-AT37.date=20160815
-holiday.de-AT38.name=Rupert
+holiday.de-AT38.name=Rupert (S)
-holiday.de-AT38.date=20210924
+holiday.de-AT38.date=20160924
-holiday.de-AT39.name=Tag der Volksabstimmung
+holiday.de-AT39.name=Tag der Volksabstimmung (K)
-holiday.de-AT39.date=20211010
+holiday.de-AT39.date=20161010
 holiday.de-AT40.name=Nationalfeiertag
-holiday.de-AT40.date=20211026
+holiday.de-AT40.date=20161026
 holiday.de-AT41.name=Allerheiligen
-holiday.de-AT41.date=20211101
+holiday.de-AT41.date=20161101
-holiday.de-AT42.name=Martin
+holiday.de-AT42.name=Martin (B)
-holiday.de-AT42.date=20211111
+holiday.de-AT42.date=20161111
-holiday.de-AT43.name=Leopold
+holiday.de-AT43.name=Leopold (W, N)
-holiday.de-AT43.date=20211115
+holiday.de-AT43.date=20161115
 holiday.de-AT44.name=Mariä Empfängnis
-holiday.de-AT44.date=20211208
+holiday.de-AT44.date=20161208
 holiday.de-AT45.name=Heiliger Abend
-holiday.de-AT45.date=20211224
+holiday.de-AT45.date=20161224
 holiday.de-AT46.name=Christtag
-holiday.de-AT46.date=20211225
+holiday.de-AT46.date=20161225
 holiday.de-AT47.name=Stefanitag
-holiday.de-AT47.date=20211226
+holiday.de-AT47.date=20161226
 holiday.de-AT48.name=Silvester
-holiday.de-AT48.date=20211231
+holiday.de-AT48.date=20161231
--- a/doc/rc/holidays.de-BE.rc
+++ b/doc/rc/holidays.de-BE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/de-BE/2020.json
+# http://holidata.net/de-BE/2015.json
-# https://holidata.net/de-BE/2021.json
+# http://holidata.net/de-BE/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,55 +23,55 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-BE1.name=Neujahr
-holiday.de-BE1.date=20200101
+holiday.de-BE1.date=20150101
 holiday.de-BE2.name=Ostern
-holiday.de-BE2.date=20200412
+holiday.de-BE2.date=20150405
 holiday.de-BE3.name=Ostermontag
-holiday.de-BE3.date=20200413
+holiday.de-BE3.date=20150406
 holiday.de-BE4.name=Tag der Arbeit
-holiday.de-BE4.date=20200501
+holiday.de-BE4.date=20150501
 holiday.de-BE5.name=Christi Himmelfahrt
-holiday.de-BE5.date=20200521
+holiday.de-BE5.date=20150514
 holiday.de-BE6.name=Pfingsten
-holiday.de-BE6.date=20200531
+holiday.de-BE6.date=20150524
 holiday.de-BE7.name=Pfingstmontag
-holiday.de-BE7.date=20200601
+holiday.de-BE7.date=20150525
 holiday.de-BE8.name=Nationalfeiertag
-holiday.de-BE8.date=20200721
+holiday.de-BE8.date=20150721
 holiday.de-BE9.name=Mariä Himmelfahrt
-holiday.de-BE9.date=20200815
+holiday.de-BE9.date=20150815
 holiday.de-BE10.name=Allerheiligen
-holiday.de-BE10.date=20201101
+holiday.de-BE10.date=20151101
 holiday.de-BE11.name=Waffenstillstand
-holiday.de-BE11.date=20201111
+holiday.de-BE11.date=20151111
 holiday.de-BE12.name=Weihnacht
-holiday.de-BE12.date=20201225
+holiday.de-BE12.date=20151225
 holiday.de-BE13.name=Neujahr
-holiday.de-BE13.date=20210101
+holiday.de-BE13.date=20160101
 holiday.de-BE14.name=Ostern
-holiday.de-BE14.date=20210404
+holiday.de-BE14.date=20160527
 holiday.de-BE15.name=Ostermontag
-holiday.de-BE15.date=20210405
+holiday.de-BE15.date=20160528
 holiday.de-BE16.name=Tag der Arbeit
-holiday.de-BE16.date=20210501
+holiday.de-BE16.date=20160501
 holiday.de-BE17.name=Christi Himmelfahrt
-holiday.de-BE17.date=20210513
+holiday.de-BE17.date=20160505
 holiday.de-BE18.name=Pfingsten
-holiday.de-BE18.date=20210523
+holiday.de-BE18.date=20160515
 holiday.de-BE19.name=Pfingstmontag
-holiday.de-BE19.date=20210524
+holiday.de-BE19.date=20160516
 holiday.de-BE20.name=Nationalfeiertag
-holiday.de-BE20.date=20210721
+holiday.de-BE20.date=20160721
 holiday.de-BE21.name=Mariä Himmelfahrt
-holiday.de-BE21.date=20210815
+holiday.de-BE21.date=20160815
 holiday.de-BE22.name=Allerheiligen
-holiday.de-BE22.date=20211101
+holiday.de-BE22.date=20161101
 holiday.de-BE23.name=Waffenstillstand
-holiday.de-BE23.date=20211111
+holiday.de-BE23.date=20161111
 holiday.de-BE24.name=Weihnacht
-holiday.de-BE24.date=20211225
+holiday.de-BE24.date=20161225
--- a/doc/rc/holidays.de-CH.rc
+++ b/doc/rc/holidays.de-CH.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/de-CH/2020.json
+# http://holidata.net/de-CH/2015.json
-# https://holidata.net/de-CH/2021.json
+# http://holidata.net/de-CH/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,79 +23,79 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-CH1.name=Neujahrstag
-holiday.de-CH1.date=20200101
+holiday.de-CH1.date=20150101
 holiday.de-CH2.name=Berchtoldstag
-holiday.de-CH2.date=20200102
+holiday.de-CH2.date=20150102
 holiday.de-CH3.name=Heilige Drei Könige
-holiday.de-CH3.date=20200106
+holiday.de-CH3.date=20150106
 holiday.de-CH4.name=Josefstag
-holiday.de-CH4.date=20200319
+holiday.de-CH4.date=20150319
 holiday.de-CH5.name=Karfreitag
-holiday.de-CH5.date=20200410
+holiday.de-CH5.date=20150403
 holiday.de-CH6.name=Ostersonntag
-holiday.de-CH6.date=20200412
+holiday.de-CH6.date=20150405
 holiday.de-CH7.name=Ostermontag
-holiday.de-CH7.date=20200413
+holiday.de-CH7.date=20150406
 holiday.de-CH8.name=Tag der Arbeit
-holiday.de-CH8.date=20200501
+holiday.de-CH8.date=20150501
 holiday.de-CH9.name=Auffahrt
-holiday.de-CH9.date=20200521
+holiday.de-CH9.date=20150514
 holiday.de-CH10.name=Pfingstsonntag
-holiday.de-CH10.date=20200531
+holiday.de-CH10.date=20150524
 holiday.de-CH11.name=Pfingstmontag
-holiday.de-CH11.date=20200601
+holiday.de-CH11.date=20150525
 holiday.de-CH12.name=Fronleichnam
-holiday.de-CH12.date=20200611
+holiday.de-CH12.date=20150604
 holiday.de-CH13.name=Bundesfeier
-holiday.de-CH13.date=20200801
+holiday.de-CH13.date=20150801
 holiday.de-CH14.name=Mariä Himmelfahrt
-holiday.de-CH14.date=20200815
+holiday.de-CH14.date=20150815
 holiday.de-CH15.name=Allerheiligen
-holiday.de-CH15.date=20201101
+holiday.de-CH15.date=20151101
 holiday.de-CH16.name=Mariä Empfängnis
-holiday.de-CH16.date=20201208
+holiday.de-CH16.date=20151208
 holiday.de-CH17.name=Weihnachtstag
-holiday.de-CH17.date=20201225
+holiday.de-CH17.date=20151225
 holiday.de-CH18.name=Stephanstag
-holiday.de-CH18.date=20201226
+holiday.de-CH18.date=20151226
 holiday.de-CH19.name=Neujahrstag
-holiday.de-CH19.date=20210101
+holiday.de-CH19.date=20160101
 holiday.de-CH20.name=Berchtoldstag
-holiday.de-CH20.date=20210102
+holiday.de-CH20.date=20160102
 holiday.de-CH21.name=Heilige Drei Könige
-holiday.de-CH21.date=20210106
+holiday.de-CH21.date=20160106
 holiday.de-CH22.name=Josefstag
-holiday.de-CH22.date=20210319
+holiday.de-CH22.date=20160319
 holiday.de-CH23.name=Karfreitag
-holiday.de-CH23.date=20210402
+holiday.de-CH23.date=20160325
 holiday.de-CH24.name=Ostersonntag
-holiday.de-CH24.date=20210404
+holiday.de-CH24.date=20160327
 holiday.de-CH25.name=Ostermontag
-holiday.de-CH25.date=20210405
+holiday.de-CH25.date=20160328
 holiday.de-CH26.name=Tag der Arbeit
-holiday.de-CH26.date=20210501
+holiday.de-CH26.date=20160501
 holiday.de-CH27.name=Auffahrt
-holiday.de-CH27.date=20210513
+holiday.de-CH27.date=20160505
 holiday.de-CH28.name=Pfingstsonntag
-holiday.de-CH28.date=20210523
+holiday.de-CH28.date=20160515
 holiday.de-CH29.name=Pfingstmontag
-holiday.de-CH29.date=20210524
+holiday.de-CH29.date=20160516
 holiday.de-CH30.name=Fronleichnam
-holiday.de-CH30.date=20210603
+holiday.de-CH30.date=20160526
 holiday.de-CH31.name=Bundesfeier
-holiday.de-CH31.date=20210801
+holiday.de-CH31.date=20160801
 holiday.de-CH32.name=Mariä Himmelfahrt
-holiday.de-CH32.date=20210815
+holiday.de-CH32.date=20160815
 holiday.de-CH33.name=Allerheiligen
-holiday.de-CH33.date=20211101
+holiday.de-CH33.date=20161101
 holiday.de-CH34.name=Mariä Empfängnis
-holiday.de-CH34.date=20211208
+holiday.de-CH34.date=20161208
 holiday.de-CH35.name=Weihnachtstag
-holiday.de-CH35.date=20211225
+holiday.de-CH35.date=20161225
 holiday.de-CH36.name=Stephanstag
-holiday.de-CH36.date=20211226
+holiday.de-CH36.date=20161226
--- a/doc/rc/holidays.de-DE.rc
+++ b/doc/rc/holidays.de-DE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/de-DE/2020.json
+# http://holidata.net/de-DE/2015.json
-# https://holidata.net/de-DE/2021.json
+# http://holidata.net/de-DE/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,89 +23,83 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-DE1.name=Neujahr
-holiday.de-DE1.date=20200101
+holiday.de-DE1.date=20150101
 holiday.de-DE2.name=Heilige drei Könige
-holiday.de-DE2.date=20200106
+holiday.de-DE2.date=20150106
-holiday.de-DE3.name=Internationaler Frauentag
+holiday.de-DE3.name=Karfreitag
-holiday.de-DE3.date=20200308
+holiday.de-DE3.date=20150403
-holiday.de-DE4.name=Karfreitag
+holiday.de-DE4.name=Ostern
-holiday.de-DE4.date=20200410
+holiday.de-DE4.date=20150405
-holiday.de-DE5.name=Ostern
+holiday.de-DE5.name=Ostermontag
-holiday.de-DE5.date=20200412
+holiday.de-DE5.date=20150406
-holiday.de-DE6.name=Ostermontag
+holiday.de-DE6.name=Erster Maifeiertag
-holiday.de-DE6.date=20200413
+holiday.de-DE6.date=20150501
-holiday.de-DE7.name=Erster Maifeiertag
+holiday.de-DE7.name=Christi Himmelfahrt
-holiday.de-DE7.date=20200501
+holiday.de-DE7.date=20150514
-holiday.de-DE8.name=75. Jahrestag der Befreiung vom Nationalsozialismus und der Beendigung des Zweiten Weltkrieges in Europa
+holiday.de-DE8.name=Pfingstsonntag
-holiday.de-DE8.date=20200508
+holiday.de-DE8.date=20150524
-holiday.de-DE9.name=Christi Himmelfahrt
+holiday.de-DE9.name=Pfingstmontag
-holiday.de-DE9.date=20200521
+holiday.de-DE9.date=20150525
-holiday.de-DE10.name=Pfingstsonntag
+holiday.de-DE10.name=Fronleichnam
-holiday.de-DE10.date=20200531
+holiday.de-DE10.date=20150604
-holiday.de-DE11.name=Pfingstmontag
+holiday.de-DE11.name=Mariä Himmelfahrt
-holiday.de-DE11.date=20200601
+holiday.de-DE11.date=20150815
-holiday.de-DE12.name=Fronleichnam
+holiday.de-DE12.name=Tag der Deutschen Einheit
-holiday.de-DE12.date=20200611
+holiday.de-DE12.date=20151003
-holiday.de-DE13.name=Mariä Himmelfahrt
+holiday.de-DE13.name=Reformationstag
-holiday.de-DE13.date=20200815
+holiday.de-DE13.date=20151031
-holiday.de-DE14.name=Tag der Deutschen Einheit
+holiday.de-DE14.name=Allerheiligen
-holiday.de-DE14.date=20201003
+holiday.de-DE14.date=20151101
-holiday.de-DE15.name=Reformationstag
+holiday.de-DE15.name=Buß- und Bettag
-holiday.de-DE15.date=20201031
+holiday.de-DE15.date=20151118
-holiday.de-DE16.name=Allerheiligen
+holiday.de-DE16.name=Heilig Abend
-holiday.de-DE16.date=20201101
+holiday.de-DE16.date=20151224
-holiday.de-DE17.name=Buß- und Bettag
+holiday.de-DE17.name=Weihnachtstag
-holiday.de-DE17.date=20201118
+holiday.de-DE17.date=20151225
-holiday.de-DE18.name=Heilig Abend
+holiday.de-DE18.name=Zweiter Weihnachtstag
-holiday.de-DE18.date=20201224
+holiday.de-DE18.date=20151226
-holiday.de-DE19.name=Weihnachtstag
+holiday.de-DE19.name=Silvester
-holiday.de-DE19.date=20201225
+holiday.de-DE19.date=20151231
-holiday.de-DE20.name=Zweiter Weihnachtstag
+holiday.de-DE20.name=Neujahr
-holiday.de-DE20.date=20201226
+holiday.de-DE20.date=20160101
-holiday.de-DE21.name=Silvester
+holiday.de-DE21.name=Heilige drei Könige
-holiday.de-DE21.date=20201231
+holiday.de-DE21.date=20160106
-holiday.de-DE22.name=Neujahr
+holiday.de-DE22.name=Karfreitag
-holiday.de-DE22.date=20210101
+holiday.de-DE22.date=20160325
-holiday.de-DE23.name=Heilige drei Könige
+holiday.de-DE23.name=Ostern
-holiday.de-DE23.date=20210106
+holiday.de-DE23.date=20160327
-holiday.de-DE24.name=Internationaler Frauentag
+holiday.de-DE24.name=Ostermontag
-holiday.de-DE24.date=20210308
+holiday.de-DE24.date=20160328
-holiday.de-DE25.name=Karfreitag
+holiday.de-DE25.name=Erster Maifeiertag
-holiday.de-DE25.date=20210402
+holiday.de-DE25.date=20160501
-holiday.de-DE26.name=Ostern
+holiday.de-DE26.name=Christi Himmelfahrt
-holiday.de-DE26.date=20210404
+holiday.de-DE26.date=20160505
-holiday.de-DE27.name=Ostermontag
+holiday.de-DE27.name=Pfingstsonntag
-holiday.de-DE27.date=20210405
+holiday.de-DE27.date=20160515
-holiday.de-DE28.name=Erster Maifeiertag
+holiday.de-DE28.name=Pfingstmontag
-holiday.de-DE28.date=20210501
+holiday.de-DE28.date=20160516
-holiday.de-DE29.name=Christi Himmelfahrt
+holiday.de-DE29.name=Fronleichnam
-holiday.de-DE29.date=20210513
+holiday.de-DE29.date=20160526
-holiday.de-DE30.name=Pfingstsonntag
+holiday.de-DE30.name=Mariä Himmelfahrt
-holiday.de-DE30.date=20210523
+holiday.de-DE30.date=20160815
-holiday.de-DE31.name=Pfingstmontag
+holiday.de-DE31.name=Tag der Deutschen Einheit
-holiday.de-DE31.date=20210524
+holiday.de-DE31.date=20161003
-holiday.de-DE32.name=Fronleichnam
+holiday.de-DE32.name=Reformationstag
-holiday.de-DE32.date=20210603
+holiday.de-DE32.date=20161031
-holiday.de-DE33.name=Mariä Himmelfahrt
+holiday.de-DE33.name=Allerheiligen
-holiday.de-DE33.date=20210815
+holiday.de-DE33.date=20161101
-holiday.de-DE34.name=Tag der Deutschen Einheit
+holiday.de-DE34.name=Buß- und Bettag
-holiday.de-DE34.date=20211003
+holiday.de-DE34.date=20161116
-holiday.de-DE35.name=Reformationstag
+holiday.de-DE35.name=Heilig Abend
-holiday.de-DE35.date=20211031
+holiday.de-DE35.date=20161224
-holiday.de-DE36.name=Allerheiligen
+holiday.de-DE36.name=Weihnachtstag
-holiday.de-DE36.date=20211101
+holiday.de-DE36.date=20161225
-holiday.de-DE37.name=Buß- und Bettag
+holiday.de-DE37.name=Zweiter Weihnachtstag
-holiday.de-DE37.date=20211117
+holiday.de-DE37.date=20161226
-holiday.de-DE38.name=Heilig Abend
+holiday.de-DE38.name=Silvester
-holiday.de-DE38.date=20211224
+holiday.de-DE38.date=20161231
 holiday.de-DE39.name=Weihnachtstag
 holiday.de-DE39.date=20211225
 holiday.de-DE40.name=Zweiter Weihnachtstag
 holiday.de-DE40.date=20211226
 holiday.de-DE41.name=Silvester
 holiday.de-DE41.date=20211231
--- a/doc/rc/holidays.el-GR.rc
+++ b/doc/rc/holidays.el-GR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/el-GR/2020.json
+# http://holidata.net/el-GR/2015.json
-# https://holidata.net/el-GR/2021.json
+# http://holidata.net/el-GR/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,63 +23,63 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.el-GR1.name=Πρωτοχρονιά
-holiday.el-GR1.date=20200101
+holiday.el-GR1.date=20150101
 holiday.el-GR2.name=Θεοφάνεια
-holiday.el-GR2.date=20200106
+holiday.el-GR2.date=20150106
 holiday.el-GR3.name=Καθαρά Δευτέρα
-holiday.el-GR3.date=20200302
+holiday.el-GR3.date=20150223
 holiday.el-GR4.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
-holiday.el-GR4.date=20200325
+holiday.el-GR4.date=20150325
-holiday.el-GR5.name=Μεγάλη Παρασκευή
+holiday.el-GR5.name=Πρωτομαγιά
-holiday.el-GR5.date=20200417
+holiday.el-GR5.date=20150418
-holiday.el-GR6.name=Μεγάλο Σάββατο
+holiday.el-GR6.name=Μεγάλη Παρασκευή
-holiday.el-GR6.date=20200418
+holiday.el-GR6.date=20150410
-holiday.el-GR7.name=Πάσχα
+holiday.el-GR7.name=Μεγάλο Σάββατο
-holiday.el-GR7.date=20200419
+holiday.el-GR7.date=20150411
-holiday.el-GR8.name=Δευτέρα του Πάσχα
+holiday.el-GR8.name=Πάσχα
-holiday.el-GR8.date=20200420
+holiday.el-GR8.date=20150412
-holiday.el-GR9.name=Πρωτομαγιά
+holiday.el-GR9.name=Δευτέρα του Πάσχα
-holiday.el-GR9.date=20200501
+holiday.el-GR9.date=20150413
 holiday.el-GR10.name=Δευτέρα του Αγίου Πνεύματος
-holiday.el-GR10.date=20200608
+holiday.el-GR10.date=20150601
 holiday.el-GR11.name=Κοίμηση της Θεοτόκου
-holiday.el-GR11.date=20200815
+holiday.el-GR11.date=20150815
 holiday.el-GR12.name=Ημέρα του ΌΧΙ
-holiday.el-GR12.date=20201028
+holiday.el-GR12.date=20151028
 holiday.el-GR13.name=Χριστούγεννα
-holiday.el-GR13.date=20201225
+holiday.el-GR13.date=20151225
 holiday.el-GR14.name=Επόμενη ημέρα Χριστουγέννων
-holiday.el-GR14.date=20201226
+holiday.el-GR14.date=20151226
 holiday.el-GR15.name=Πρωτοχρονιά
-holiday.el-GR15.date=20210101
+holiday.el-GR15.date=20160101
 holiday.el-GR16.name=Θεοφάνεια
-holiday.el-GR16.date=20210106
+holiday.el-GR16.date=20160106
 holiday.el-GR17.name=Καθαρά Δευτέρα
-holiday.el-GR17.date=20210315
+holiday.el-GR17.date=20160314
 holiday.el-GR18.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
-holiday.el-GR18.date=20210325
+holiday.el-GR18.date=20160325
-holiday.el-GR19.name=Μεγάλη Παρασκευή
+holiday.el-GR19.name=Πρωτομαγιά
-holiday.el-GR19.date=20210430
+holiday.el-GR19.date=20160418
-holiday.el-GR20.name=Μεγάλο Σάββατο
+holiday.el-GR20.name=Μεγάλη Παρασκευή
-holiday.el-GR20.date=20210501
+holiday.el-GR20.date=20160429
-holiday.el-GR21.name=Πρωτομαγιά
+holiday.el-GR21.name=Μεγάλο Σάββατο
-holiday.el-GR21.date=20210501
+holiday.el-GR21.date=20160430
 holiday.el-GR22.name=Πάσχα
-holiday.el-GR22.date=20210502
+holiday.el-GR22.date=20160501
 holiday.el-GR23.name=Δευτέρα του Πάσχα
-holiday.el-GR23.date=20210503
+holiday.el-GR23.date=20160502
 holiday.el-GR24.name=Δευτέρα του Αγίου Πνεύματος
-holiday.el-GR24.date=20210621
+holiday.el-GR24.date=20160620
 holiday.el-GR25.name=Κοίμηση της Θεοτόκου
-holiday.el-GR25.date=20210815
+holiday.el-GR25.date=20160815
 holiday.el-GR26.name=Ημέρα του ΌΧΙ
-holiday.el-GR26.date=20211028
+holiday.el-GR26.date=20161028
 holiday.el-GR27.name=Χριστούγεννα
-holiday.el-GR27.date=20211225
+holiday.el-GR27.date=20161225
 holiday.el-GR28.name=Επόμενη ημέρα Χριστουγέννων
-holiday.el-GR28.date=20211226
+holiday.el-GR28.date=20161226
--- a/doc/rc/holidays.en-AU.rc
+++ b/doc/rc/holidays.en-AU.rc
@@ -0,0 +1,119 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-AU/2015.json
 # http://holidata.net/en-AU/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-AU1.name=New Year's Day
 holiday.en-AU1.date=20150101
 holiday.en-AU2.name=Australia Day
 holiday.en-AU2.date=20150126
 holiday.en-AU3.name=Royal Hobart Regatta
 holiday.en-AU3.date=20150209
 holiday.en-AU4.name=Labour Day
 holiday.en-AU4.date=20150302
 holiday.en-AU5.name=Labour Day
 holiday.en-AU5.date=20150309
 holiday.en-AU6.name=Canberra Day
 holiday.en-AU6.date=20150309
 holiday.en-AU7.name=Eight Hours Day
 holiday.en-AU7.date=20150309
 holiday.en-AU8.name=Good Friday
 holiday.en-AU8.date=20150403
 holiday.en-AU9.name=Easter Saturday
 holiday.en-AU9.date=20150404
 holiday.en-AU10.name=Easter Sunday
 holiday.en-AU10.date=20150405
 holiday.en-AU11.name=Easter Monday
 holiday.en-AU11.date=20150406
 holiday.en-AU12.name=Anzac Day
 holiday.en-AU12.date=20150425
 holiday.en-AU13.name=May Day
 holiday.en-AU13.date=20150504
 holiday.en-AU14.name=Foundation Day
 holiday.en-AU14.date=20150601
 holiday.en-AU15.name=Queen's Birthday
 holiday.en-AU15.date=20150608
 holiday.en-AU16.name=Picnic Day
 holiday.en-AU16.date=20150803
 holiday.en-AU17.name=Bank Holiday
 holiday.en-AU17.date=20150803
 holiday.en-AU18.name=Queen's Birthday
 holiday.en-AU18.date=20150928
 holiday.en-AU19.name=Labour Day
 holiday.en-AU19.date=20151005
 holiday.en-AU20.name=Recreation Day
 holiday.en-AU20.date=20151102
 holiday.en-AU21.name=Christmas Day
 holiday.en-AU21.date=20151225
 holiday.en-AU22.name=Boxing Day
 holiday.en-AU22.date=20151226
 holiday.en-AU23.name=Proclamation Day
 holiday.en-AU23.date=20151226
 holiday.en-AU24.name=New Year's Day
 holiday.en-AU24.date=20160101
 holiday.en-AU25.name=Australia Day
 holiday.en-AU25.date=20160126
 holiday.en-AU26.name=Royal Hobart Regatta
 holiday.en-AU26.date=20160208
 holiday.en-AU27.name=Labour Day
 holiday.en-AU27.date=20160307
 holiday.en-AU28.name=Labour Day
 holiday.en-AU28.date=20160314
 holiday.en-AU29.name=Canberra Day
 holiday.en-AU29.date=20160314
 holiday.en-AU30.name=Eight Hours Day
 holiday.en-AU30.date=20160314
 holiday.en-AU31.name=Good Friday
 holiday.en-AU31.date=20160325
 holiday.en-AU32.name=Easter Saturday
 holiday.en-AU32.date=20160326
 holiday.en-AU33.name=Easter Monday
 holiday.en-AU33.date=20160327
 holiday.en-AU34.name=Anzac Day
 holiday.en-AU34.date=20160425
 holiday.en-AU35.name=May Day
 holiday.en-AU35.date=20160502
 holiday.en-AU36.name=Foundation Day
 holiday.en-AU36.date=20160603
 holiday.en-AU37.name=Queen's Birthday
 holiday.en-AU37.date=20160613
 holiday.en-AU38.name=Picnic Day
 holiday.en-AU38.date=20160801
 holiday.en-AU39.name=Bank Holiday
 holiday.en-AU39.date=20160801
 holiday.en-AU40.name=Queen's Birthday
 holiday.en-AU40.date=20160926
 holiday.en-AU41.name=Labour Day
 holiday.en-AU41.date=20161003
 holiday.en-AU42.name=Recreation Day
 holiday.en-AU42.date=20161107
 holiday.en-AU43.name=Christmas Day
 holiday.en-AU43.date=20161225
 holiday.en-AU44.name=Boxing Day
 holiday.en-AU44.date=20161226
 holiday.en-AU45.name=Proclamation Day
 holiday.en-AU45.date=20161226
--- a/doc/rc/holidays.en-CA.rc
+++ b/doc/rc/holidays.en-CA.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/en-CA/2020.json
+# http://holidata.net/en-CA/2015.json
-# https://holidata.net/en-CA/2021.json
+# http://holidata.net/en-CA/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,83 +23,55 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-CA1.name=New Year's Day
-holiday.en-CA1.date=20200101
+holiday.en-CA1.date=20150101
 holiday.en-CA2.name=Family Day
-holiday.en-CA2.date=20200217
+holiday.en-CA2.date=20150209
-holiday.en-CA3.name=Louis Riel Day
+holiday.en-CA3.name=Good Friday
-holiday.en-CA3.date=20200217
+holiday.en-CA3.date=20150403
-holiday.en-CA4.name=Islander Day
+holiday.en-CA4.name=Easter Monday
-holiday.en-CA4.date=20200217
+holiday.en-CA4.date=20150406
-holiday.en-CA5.name=Good Friday
+holiday.en-CA5.name=Victoria Day
-holiday.en-CA5.date=20200410
+holiday.en-CA5.date=20150518
-holiday.en-CA6.name=Easter Monday
+holiday.en-CA6.name=Canada Day
-holiday.en-CA6.date=20200413
+holiday.en-CA6.date=20150701
-holiday.en-CA7.name=National Patriots' Day
+holiday.en-CA7.name=First Monday of August
-holiday.en-CA7.date=20200518
+holiday.en-CA7.date=20150803
-holiday.en-CA8.name=Victoria Day
+holiday.en-CA8.name=Labour Day
-holiday.en-CA8.date=20200518
+holiday.en-CA8.date=20150907
-holiday.en-CA9.name=National Holiday
+holiday.en-CA9.name=Thanksgiving Day
-holiday.en-CA9.date=20200624
+holiday.en-CA9.date=20151012
-holiday.en-CA10.name=Canada Day
+holiday.en-CA10.name=Remembrance Day
-holiday.en-CA10.date=20200701
+holiday.en-CA10.date=20151111
-holiday.en-CA11.name=August Civic Holiday
+holiday.en-CA11.name=Christmas Day
-holiday.en-CA11.date=20200803
+holiday.en-CA11.date=20151225
-holiday.en-CA12.name=Saskatchewan Day
+holiday.en-CA12.name=Boxing Day
-holiday.en-CA12.date=20200803
+holiday.en-CA12.date=20151226
-holiday.en-CA13.name=Heritage Day
+holiday.en-CA13.name=New Year's Day
-holiday.en-CA13.date=20200803
+holiday.en-CA13.date=20160101
-holiday.en-CA14.name=New Brunswick Day
+holiday.en-CA14.name=Family Day
-holiday.en-CA14.date=20200803
+holiday.en-CA14.date=20160208
-holiday.en-CA15.name=Labour Day
+holiday.en-CA15.name=Good Friday
-holiday.en-CA15.date=20200907
+holiday.en-CA15.date=20160325
-holiday.en-CA16.name=Thanksgiving Day
+holiday.en-CA16.name=Easter Monday
-holiday.en-CA16.date=20201012
+holiday.en-CA16.date=20160328
-holiday.en-CA17.name=Remembrance Day
+holiday.en-CA17.name=Victoria Day
-holiday.en-CA17.date=20201111
+holiday.en-CA17.date=20160523
-holiday.en-CA18.name=Christmas Day
+holiday.en-CA18.name=Canada Day
-holiday.en-CA18.date=20201225
+holiday.en-CA18.date=20160701
-holiday.en-CA19.name=Boxing Day
+holiday.en-CA19.name=First Monday of August
-holiday.en-CA19.date=20201226
+holiday.en-CA19.date=20160801
-holiday.en-CA20.name=New Year's Day
+holiday.en-CA20.name=Labour Day
-holiday.en-CA20.date=20210101
+holiday.en-CA20.date=20160905
-holiday.en-CA21.name=Family Day
+holiday.en-CA21.name=Thanksgiving Day
-holiday.en-CA21.date=20210215
+holiday.en-CA21.date=20161010
-holiday.en-CA22.name=Louis Riel Day
+holiday.en-CA22.name=Remembrance Day
-holiday.en-CA22.date=20210215
+holiday.en-CA22.date=20161111
-holiday.en-CA23.name=Islander Day
+holiday.en-CA23.name=Christmas Day
-holiday.en-CA23.date=20210215
+holiday.en-CA23.date=20161225
-holiday.en-CA24.name=Good Friday
+holiday.en-CA24.name=Boxing Day
-holiday.en-CA24.date=20210402
+holiday.en-CA24.date=20161226
 holiday.en-CA25.name=Easter Monday
 holiday.en-CA25.date=20210405
 holiday.en-CA26.name=National Patriots' Day
 holiday.en-CA26.date=20210524
 holiday.en-CA27.name=Victoria Day
 holiday.en-CA27.date=20210524
 holiday.en-CA28.name=National Holiday
 holiday.en-CA28.date=20210624
 holiday.en-CA29.name=Canada Day
 holiday.en-CA29.date=20210701
 holiday.en-CA30.name=August Civic Holiday
 holiday.en-CA30.date=20210802
 holiday.en-CA31.name=Saskatchewan Day
 holiday.en-CA31.date=20210802
 holiday.en-CA32.name=Heritage Day
 holiday.en-CA32.date=20210802
 holiday.en-CA33.name=New Brunswick Day
 holiday.en-CA33.date=20210802
 holiday.en-CA34.name=Labour Day
 holiday.en-CA34.date=20210906
 holiday.en-CA35.name=Thanksgiving Day
 holiday.en-CA35.date=20211011
 holiday.en-CA36.name=Remembrance Day
 holiday.en-CA36.date=20211111
 holiday.en-CA37.name=Christmas Day
 holiday.en-CA37.date=20211225
 holiday.en-CA38.name=Boxing Day
 holiday.en-CA38.date=20211226
--- a/doc/rc/holidays.en-GB.rc
+++ b/doc/rc/holidays.en-GB.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/en-GB/2020.json
+# http://holidata.net/en-GB/2015.json
-# https://holidata.net/en-GB/2021.json
+# http://holidata.net/en-GB/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,45 +23,39 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-GB1.name=New Year's Day
-holiday.en-GB1.date=20200101
+holiday.en-GB1.date=20150101
 holiday.en-GB2.name=Good Friday
-holiday.en-GB2.date=20200410
+holiday.en-GB2.date=20150403
 holiday.en-GB3.name=Easter Monday
-holiday.en-GB3.date=20200413
+holiday.en-GB3.date=20150406
 holiday.en-GB4.name=Early May Bank Holiday
-holiday.en-GB4.date=20200504
+holiday.en-GB4.date=20150504
 holiday.en-GB5.name=Spring Bank Holiday
-holiday.en-GB5.date=20200525
+holiday.en-GB5.date=20150525
 holiday.en-GB6.name=August Bank Holiday
-holiday.en-GB6.date=20200831
+holiday.en-GB6.date=20150831
 holiday.en-GB7.name=Christmas Day
-holiday.en-GB7.date=20201225
+holiday.en-GB7.date=20151225
 holiday.en-GB8.name=Boxing Day
-holiday.en-GB8.date=20201226
+holiday.en-GB8.date=20151226
-holiday.en-GB9.name=Boxing Day (observed)
+holiday.en-GB9.name=New Year's Day
-holiday.en-GB9.date=20201228
+holiday.en-GB9.date=20160101
-holiday.en-GB10.name=New Year's Day
+holiday.en-GB10.name=Good Friday
-holiday.en-GB10.date=20210101
+holiday.en-GB10.date=20160325
-holiday.en-GB11.name=Good Friday
+holiday.en-GB11.name=Easter Monday
-holiday.en-GB11.date=20210402
+holiday.en-GB11.date=20160328
-holiday.en-GB12.name=Easter Monday
+holiday.en-GB12.name=Early May Bank Holiday
-holiday.en-GB12.date=20210405
+holiday.en-GB12.date=20160502
-holiday.en-GB13.name=Early May Bank Holiday
+holiday.en-GB13.name=Spring Bank Holiday
-holiday.en-GB13.date=20210503
+holiday.en-GB13.date=20160530
-holiday.en-GB14.name=Spring Bank Holiday
+holiday.en-GB14.name=August Bank Holiday
-holiday.en-GB14.date=20210531
+holiday.en-GB14.date=20160829
-holiday.en-GB15.name=August Bank Holiday
+holiday.en-GB15.name=Christmas Day
-holiday.en-GB15.date=20210830
+holiday.en-GB15.date=20161225
-holiday.en-GB16.name=Christmas Day
+holiday.en-GB16.name=Boxing Day
-holiday.en-GB16.date=20211225
+holiday.en-GB16.date=20161226
 holiday.en-GB17.name=Boxing Day
 holiday.en-GB17.date=20211226
 holiday.en-GB18.name=Christmas Day (observed)
 holiday.en-GB18.date=20211227
 holiday.en-GB19.name=Boxing Day (observed)
 holiday.en-GB19.date=20211228
--- a/doc/rc/holidays.en-GL.rc
+++ b/doc/rc/holidays.en-GL.rc
@@ -0,0 +1,81 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-GL/2015.json
 # http://holidata.net/en-GL/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-GL1.name=New Year's Day
 holiday.en-GL1.date=20150101
 holiday.en-GL2.name=Epiphany
 holiday.en-GL2.date=20150106
 holiday.en-GL3.name=Maundy Thursday
 holiday.en-GL3.date=20150402
 holiday.en-GL4.name=Good Friday
 holiday.en-GL4.date=20150303
 holiday.en-GL5.name=Easter Monday
 holiday.en-GL5.date=20150406
 holiday.en-GL6.name=General Prayer Day
 holiday.en-GL6.date=20150501
 holiday.en-GL7.name=Ascension
 holiday.en-GL7.date=20150514
 holiday.en-GL8.name=Whit Monday
 holiday.en-GL8.date=20150525
 holiday.en-GL9.name=Ullortuneq
 holiday.en-GL9.date=20150621
 holiday.en-GL10.name=Christmas Eve
 holiday.en-GL10.date=20151224
 holiday.en-GL11.name=Christmas Day
 holiday.en-GL11.date=20151225
 holiday.en-GL12.name=St Stephen's Day
 holiday.en-GL12.date=20151226
 holiday.en-GL13.name=New Year's Eve
 holiday.en-GL13.date=20151231
 holiday.en-GL14.name=New Year's Day
 holiday.en-GL14.date=20160101
 holiday.en-GL15.name=Epiphany
 holiday.en-GL15.date=20160106
 holiday.en-GL16.name=Maundy Thursday
 holiday.en-GL16.date=20160324
 holiday.en-GL17.name=Good Friday
 holiday.en-GL17.date=20160325
 holiday.en-GL18.name=Easter Monday
 holiday.en-GL18.date=20160428
 holiday.en-GL19.name=General Prayer Day
 holiday.en-GL19.date=20160422
 holiday.en-GL20.name=Ascension
 holiday.en-GL20.date=20160505
 holiday.en-GL21.name=Whit Monday
 holiday.en-GL21.date=20160516
 holiday.en-GL22.name=Ullortuneq
 holiday.en-GL22.date=20160621
 holiday.en-GL23.name=Christmas Eve
 holiday.en-GL23.date=20161224
 holiday.en-GL24.name=Christmas Day
 holiday.en-GL24.date=20161225
 holiday.en-GL25.name=St Stephen's Day
 holiday.en-GL25.date=20161226
 holiday.en-GL26.name=New Year's Eve
 holiday.en-GL26.date=20161231
--- a/doc/rc/holidays.en-HK.rc
+++ b/doc/rc/holidays.en-HK.rc
@@ -0,0 +1,95 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-HK/2015.json
 # http://holidata.net/en-HK/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-HK1.name=The first day of January
 holiday.en-HK1.date=20150101
 holiday.en-HK2.name=Lunar New Year’s Day
 holiday.en-HK2.date=20150219
 holiday.en-HK3.name=The second day of Lunar New Year
 holiday.en-HK3.date=20150220
 holiday.en-HK4.name=The third day of Lunar New Year
 holiday.en-HK4.date=20150221
 holiday.en-HK5.name=Good Friday
 holiday.en-HK5.date=20150403
 holiday.en-HK6.name=The day following Good Friday
 holiday.en-HK6.date=20150404
 holiday.en-HK7.name=The day following Ching Ming Festival
 holiday.en-HK7.date=20150406
 holiday.en-HK8.name=The day following Easter Monday
 holiday.en-HK8.date=20150407
 holiday.en-HK9.name=Labour Day
 holiday.en-HK9.date=20150501
 holiday.en-HK10.name=The Birthday of the Buddha
 holiday.en-HK10.date=20150525
 holiday.en-HK11.name=Tuen Ng Festival
 holiday.en-HK11.date=20150620
 holiday.en-HK12.name=Hong Kong Special Administrative Region Establishment Day
 holiday.en-HK12.date=20150701
 holiday.en-HK13.name=The day following the Chinese Mid-Autumn Festival
 holiday.en-HK13.date=20150928
 holiday.en-HK14.name=National Day
 holiday.en-HK14.date=20151001
 holiday.en-HK15.name=Chung Yeung Festival
 holiday.en-HK15.date=20151021
 holiday.en-HK16.name=Christmas Day
 holiday.en-HK16.date=20151225
 holiday.en-HK17.name=The first weekday after Christmas Day
 holiday.en-HK17.date=20151226
 holiday.en-HK18.name=The first day of January
 holiday.en-HK18.date=20160101
 holiday.en-HK19.name=Lunar New Year’s Day
 holiday.en-HK19.date=20160208
 holiday.en-HK20.name=The second day of Lunar New Year
 holiday.en-HK20.date=20160209
 holiday.en-HK21.name=The third day of Lunar New Year
 holiday.en-HK21.date=20160210
 holiday.en-HK22.name=Good Friday
 holiday.en-HK22.date=20160325
 holiday.en-HK23.name=The day following Good Friday
 holiday.en-HK23.date=20160326
 holiday.en-HK24.name=Ching Ming Festival
 holiday.en-HK24.date=20160404
 holiday.en-HK25.name=Labour Day
 holiday.en-HK25.date=20160501
 holiday.en-HK26.name=The Birthday of the Buddha
 holiday.en-HK26.date=20160514
 holiday.en-HK27.name=Tuen Ng Festival
 holiday.en-HK27.date=20160609
 holiday.en-HK28.name=Hong Kong Special Administrative Region Establishment Day
 holiday.en-HK28.date=20160701
 holiday.en-HK29.name=The day following the Chinese Mid-Autumn Festival
 holiday.en-HK29.date=20160916
 holiday.en-HK30.name=National Day
 holiday.en-HK30.date=20161001
 holiday.en-HK31.name=Chung Yeung Festival
 holiday.en-HK31.date=20161010
 holiday.en-HK32.name=Christmas Day
 holiday.en-HK32.date=20161225
 holiday.en-HK33.name=The first weekday after Christmas Day
 holiday.en-HK33.date=20161226
--- a/doc/rc/holidays.en-IN.rc
+++ b/doc/rc/holidays.en-IN.rc
@@ -0,0 +1,103 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-IN/2015.json
 # http://holidata.net/en-IN/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-IN1.name=New Year's Day
 holiday.en-IN1.date=20160101
 holiday.en-IN2.name=Lohri
 holiday.en-IN2.date=20160114
 holiday.en-IN3.name=Pongal, Makar Sankranti
 holiday.en-IN3.date=20160115
 holiday.en-IN4.name=Guru Gobind Singh Jayanti
 holiday.en-IN4.date=20160116
 holiday.en-IN5.name=Republic Day
 holiday.en-IN5.date=20160126
 holiday.en-IN6.name=Vasant Panchami
 holiday.en-IN6.date=20160212
 holiday.en-IN7.name=Guru Ravidas Jayanti
 holiday.en-IN7.date=20160222
 holiday.en-IN8.name=Maha Shivaratri
 holiday.en-IN8.date=20160307
 holiday.en-IN9.name=Chhoti Holi, Holika Dahan
 holiday.en-IN9.date=20160323
 holiday.en-IN10.name=Holi
 holiday.en-IN10.date=20160324
 holiday.en-IN11.name=Good Friday
 holiday.en-IN11.date=20160325
 holiday.en-IN12.name=Easter
 holiday.en-IN12.date=20160327
 holiday.en-IN13.name=Gudi Padwa, Ugadi
 holiday.en-IN13.date=20160408
 holiday.en-IN14.name=Solar New Year, Baisakhi
 holiday.en-IN14.date=20160413
 holiday.en-IN15.name=Rama Navami
 holiday.en-IN15.date=20160415
 holiday.en-IN16.name=Hazarat Ali's Birthday
 holiday.en-IN16.date=20160421
 holiday.en-IN17.name=Buddha Purnima
 holiday.en-IN17.date=20160521
 holiday.en-IN18.name=Eid al-Fitr , Ramadan
 holiday.en-IN18.date=20160707
 holiday.en-IN19.name=Independence Day
 holiday.en-IN19.date=20160815
 holiday.en-IN20.name=Rakhi, Raksha Bandhan
 holiday.en-IN20.date=20160818
 holiday.en-IN21.name=Krishna Janmashtami
 holiday.en-IN21.date=20160825
 holiday.en-IN22.name=Ganesh Chaturthi
 holiday.en-IN22.date=20160905
 holiday.en-IN23.name=Onam, Eid al-Adha, Bakrid
 holiday.en-IN23.date=20160913
 holiday.en-IN24.name=Gandhi Jayanti
 holiday.en-IN24.date=20161002
 holiday.en-IN25.name=Durga Ashtami
 holiday.en-IN25.date=20161009
 holiday.en-IN26.name=Maha Navami
 holiday.en-IN26.date=20161010
 holiday.en-IN27.name=Dussehra, Madhvacharya Jayanti
 holiday.en-IN27.date=20161011
 holiday.en-IN28.name=Muharram
 holiday.en-IN28.date=20161012
 holiday.en-IN29.name=Valmiki Jayanti
 holiday.en-IN29.date=20161016
 holiday.en-IN30.name=Karwa Chauth
 holiday.en-IN30.date=20161019
 holiday.en-IN31.name=Diwali, Lakshmi Puja
 holiday.en-IN31.date=20161030
 holiday.en-IN32.name=Gowardhan Puja
 holiday.en-IN32.date=20161031
 holiday.en-IN33.name=Bhaiya Dooj
 holiday.en-IN33.date=20161101
 holiday.en-IN34.name=Chhath Puja
 holiday.en-IN34.date=20161106
 holiday.en-IN35.name=Guru Nanak Jayanti, Nehru Jayanti
 holiday.en-IN35.date=20161114
 holiday.en-IN36.name=Milad an-Nabi, Id-e-Milad
 holiday.en-IN36.date=20161212
 holiday.en-IN37.name=Christmas
 holiday.en-IN37.date=20161225
--- a/doc/rc/holidays.en-NZ.rc
+++ b/doc/rc/holidays.en-NZ.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/en-NZ/2020.json
+# http://holidata.net/en-NZ/2015.json
-# https://holidata.net/en-NZ/2021.json
+# http://holidata.net/en-NZ/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,59 +23,47 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-NZ1.name=New Year's Day
-holiday.en-NZ1.date=20200101
+holiday.en-NZ1.date=20150101
-holiday.en-NZ2.name=Day after New Year's Day
+holiday.en-NZ2.name=Day after New Years Day
-holiday.en-NZ2.date=20200102
+holiday.en-NZ2.date=20150102
 holiday.en-NZ3.name=Waitangi Day
-holiday.en-NZ3.date=20200206
+holiday.en-NZ3.date=20150206
 holiday.en-NZ4.name=Good Friday
-holiday.en-NZ4.date=20200410
+holiday.en-NZ4.date=20150403
 holiday.en-NZ5.name=Easter Monday
-holiday.en-NZ5.date=20200413
+holiday.en-NZ5.date=20150406
 holiday.en-NZ6.name=ANZAC Day
-holiday.en-NZ6.date=20200425
+holiday.en-NZ6.date=20150425
-holiday.en-NZ7.name=ANZAC Day (observed)
+holiday.en-NZ7.name=Queen's Birthday
-holiday.en-NZ7.date=20200427
+holiday.en-NZ7.date=20150601
-holiday.en-NZ8.name=Queen's Birthday
+holiday.en-NZ8.name=Labour Day
-holiday.en-NZ8.date=20200601
+holiday.en-NZ8.date=20151026
-holiday.en-NZ9.name=Labour Day
+holiday.en-NZ9.name=Christmas Day
-holiday.en-NZ9.date=20201026
+holiday.en-NZ9.date=20151225
-holiday.en-NZ10.name=Christmas Day
+holiday.en-NZ10.name=Boxing Day
-holiday.en-NZ10.date=20201225
+holiday.en-NZ10.date=20151226
-holiday.en-NZ11.name=Boxing Day
+holiday.en-NZ11.name=New Year's Day
-holiday.en-NZ11.date=20201226
+holiday.en-NZ11.date=20160101
-holiday.en-NZ12.name=Boxing Day (observed)
+holiday.en-NZ12.name=Day after New Years Day
-holiday.en-NZ12.date=20201228
+holiday.en-NZ12.date=20160104
-holiday.en-NZ13.name=New Year's Day
+holiday.en-NZ13.name=Waitangi Day
-holiday.en-NZ13.date=20210101
+holiday.en-NZ13.date=20160206
-holiday.en-NZ14.name=Day after New Year's Day
+holiday.en-NZ14.name=Good Friday
-holiday.en-NZ14.date=20210104
+holiday.en-NZ14.date=20160325
-holiday.en-NZ15.name=Waitangi Day
+holiday.en-NZ15.name=Easter Monday
-holiday.en-NZ15.date=20210206
+holiday.en-NZ15.date=20160328
-holiday.en-NZ16.name=Waitangi Day (observed)
+holiday.en-NZ16.name=ANZAC Day
-holiday.en-NZ16.date=20210208
+holiday.en-NZ16.date=20160425
-holiday.en-NZ17.name=Good Friday
+holiday.en-NZ17.name=Queen's Birthday
-holiday.en-NZ17.date=20210402
+holiday.en-NZ17.date=20160606
-holiday.en-NZ18.name=Easter Monday
+holiday.en-NZ18.name=Labour Day
-holiday.en-NZ18.date=20210405
+holiday.en-NZ18.date=20161024
-holiday.en-NZ19.name=ANZAC Day
+holiday.en-NZ19.name=Christmas Day
-holiday.en-NZ19.date=20210425
+holiday.en-NZ19.date=20161225
-holiday.en-NZ20.name=ANZAC Day (observed)
+holiday.en-NZ20.name=Boxing Day
-holiday.en-NZ20.date=20210426
+holiday.en-NZ20.date=20161226
 holiday.en-NZ21.name=Queen's Birthday
 holiday.en-NZ21.date=20210607
 holiday.en-NZ22.name=Labour Day
 holiday.en-NZ22.date=20211025
 holiday.en-NZ23.name=Christmas Day
 holiday.en-NZ23.date=20211225
 holiday.en-NZ24.name=Boxing Day
 holiday.en-NZ24.date=20211226
 holiday.en-NZ25.name=Christmas Day (observed)
 holiday.en-NZ25.date=20211227
 holiday.en-NZ26.name=Boxing Day (observed)
 holiday.en-NZ26.date=20211228
--- a/doc/rc/holidays.en-US.rc
+++ b/doc/rc/holidays.en-US.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/en-US/2020.json
+# http://holidata.net/en-US/2015.json
-# https://holidata.net/en-US/2021.json
+# http://holidata.net/en-US/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,55 +23,51 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-US1.name=New Year's Day
-holiday.en-US1.date=20200101
+holiday.en-US1.date=20150101
 holiday.en-US2.name=Birthday of Martin Luther King, Jr.
-holiday.en-US2.date=20200120
+holiday.en-US2.date=20150119
 holiday.en-US3.name=Washington's Birthday
-holiday.en-US3.date=20200217
+holiday.en-US3.date=20150216
 holiday.en-US4.name=Patriots' Day
-holiday.en-US4.date=20200420
+holiday.en-US4.date=20150420
 holiday.en-US5.name=Memorial Day
-holiday.en-US5.date=20200525
+holiday.en-US5.date=20150525
 holiday.en-US6.name=Independence Day
-holiday.en-US6.date=20200704
+holiday.en-US6.date=20150704
 holiday.en-US7.name=Labor Day
-holiday.en-US7.date=20200907
+holiday.en-US7.date=20150907
 holiday.en-US8.name=Columbus Day
-holiday.en-US8.date=20201012
+holiday.en-US8.date=20151012
 holiday.en-US9.name=Veterans Day
-holiday.en-US9.date=20201111
+holiday.en-US9.date=20151111
 holiday.en-US10.name=Thanksgiving Day
-holiday.en-US10.date=20201126
+holiday.en-US10.date=20151126
-holiday.en-US11.name=Day after Thanksgiving
+holiday.en-US11.name=Christmas Day
-holiday.en-US11.date=20201127
+holiday.en-US11.date=20151225
-holiday.en-US12.name=Christmas Eve
+holiday.en-US12.name=New Year's Day
-holiday.en-US12.date=20201224
+holiday.en-US12.date=20160101
-holiday.en-US13.name=Christmas Day
+holiday.en-US13.name=Birthday of Martin Luther King, Jr.
-holiday.en-US13.date=20201225
+holiday.en-US13.date=20160118
-holiday.en-US14.name=New Year's Day
+holiday.en-US14.name=Washington's Birthday
-holiday.en-US14.date=20210101
+holiday.en-US14.date=20160215
-holiday.en-US15.name=Birthday of Martin Luther King, Jr.
+holiday.en-US15.name=Patriots' Day
-holiday.en-US15.date=20210118
+holiday.en-US15.date=20160418
-holiday.en-US16.name=Washington's Birthday
+holiday.en-US16.name=Memorial Day
-holiday.en-US16.date=20210215
+holiday.en-US16.date=20160530
-holiday.en-US17.name=Patriots' Day
+holiday.en-US17.name=Independence Day
-holiday.en-US17.date=20210419
+holiday.en-US17.date=20160704
-holiday.en-US18.name=Memorial Day
+holiday.en-US18.name=Labor Day
-holiday.en-US18.date=20210531
+holiday.en-US18.date=20160905
-holiday.en-US19.name=Independence Day
+holiday.en-US19.name=Columbus Day
-holiday.en-US19.date=20210704
+holiday.en-US19.date=20161010
-holiday.en-US20.name=Labor Day
+holiday.en-US20.name=Veterans Day
-holiday.en-US20.date=20210906
+holiday.en-US20.date=20161111
-holiday.en-US21.name=Columbus Day
+holiday.en-US21.name=Thanksgiving Day
-holiday.en-US21.date=20211011
+holiday.en-US21.date=20161124
-holiday.en-US22.name=Veterans Day
+holiday.en-US22.name=Christmas Day
-holiday.en-US22.date=20211111
+holiday.en-US22.date=20161225
 holiday.en-US23.name=Thanksgiving Day
 holiday.en-US23.date=20211125
 holiday.en-US24.name=Christmas Day
 holiday.en-US24.date=20211225
--- a/doc/rc/holidays.en-ZA.rc
+++ b/doc/rc/holidays.en-ZA.rc
@@ -0,0 +1,77 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/en-ZA/2015.json
 # http://holidata.net/en-ZA/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-ZA1.name=New Year's Day
 holiday.en-ZA1.date=20150101
 holiday.en-ZA2.name=Human Rights Day
 holiday.en-ZA2.date=20150321
 holiday.en-ZA3.name=Good Friday
 holiday.en-ZA3.date=20150403
 holiday.en-ZA4.name=Family Day
 holiday.en-ZA4.date=20150406
 holiday.en-ZA5.name=Freedom Day
 holiday.en-ZA5.date=20150427
 holiday.en-ZA6.name=Workers' Day
 holiday.en-ZA6.date=20150501
 holiday.en-ZA7.name=Youth Day
 holiday.en-ZA7.date=20150616
 holiday.en-ZA8.name=National Women's Day
 holiday.en-ZA8.date=20150809
 holiday.en-ZA9.name=Heritage Day
 holiday.en-ZA9.date=20150924
 holiday.en-ZA10.name=Day of Reconciliation
 holiday.en-ZA10.date=20151217
 holiday.en-ZA11.name=Christmas Day
 holiday.en-ZA11.date=20151225
 holiday.en-ZA12.name=Day of Goodwill
 holiday.en-ZA12.date=20151226
 holiday.en-ZA13.name=New Year's Day
 holiday.en-ZA13.date=20160101
 holiday.en-ZA14.name=Human Rights Day
 holiday.en-ZA14.date=20160321
 holiday.en-ZA15.name=Good Friday
 holiday.en-ZA15.date=20160325
 holiday.en-ZA16.name=Family Day
 holiday.en-ZA16.date=20160328
 holiday.en-ZA17.name=Freedom Day
 holiday.en-ZA17.date=20160427
 holiday.en-ZA18.name=Workers' Day
 holiday.en-ZA18.date=20160501
 holiday.en-ZA19.name=Youth Day
 holiday.en-ZA19.date=20160616
 holiday.en-ZA20.name=National Women's Day
 holiday.en-ZA20.date=20160809
 holiday.en-ZA21.name=Heritage Day
 holiday.en-ZA21.date=20160924
 holiday.en-ZA22.name=Day of Reconciliation
 holiday.en-ZA22.date=20161217
 holiday.en-ZA23.name=Christmas Day
 holiday.en-ZA23.date=20161225
 holiday.en-ZA24.name=Day of Goodwill
 holiday.en-ZA24.date=20161226
--- a/doc/rc/holidays.es-CO.rc
+++ b/doc/rc/holidays.es-CO.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/es-CO/2020.json
+# http://holidata.net/es-CO/2015.json
-# https://holidata.net/es-CO/2021.json
+# http://holidata.net/es-CO/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,83 +23,83 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.es-CO1.name=Año Nuevo
-holiday.es-CO1.date=20200101
+holiday.es-CO1.date=20150101
 holiday.es-CO2.name=Día de los Reyes Magos
-holiday.es-CO2.date=20200106
+holiday.es-CO2.date=20150112
 holiday.es-CO3.name=Día de San José
-holiday.es-CO3.date=20200323
+holiday.es-CO3.date=20150323
 holiday.es-CO4.name=Jueves Santo
-holiday.es-CO4.date=20200409
+holiday.es-CO4.date=20150402
 holiday.es-CO5.name=Viernes Santo
-holiday.es-CO5.date=20200410
+holiday.es-CO5.date=20150403
 holiday.es-CO6.name=Domingo de Pascua
-holiday.es-CO6.date=20200412
+holiday.es-CO6.date=20150405
 holiday.es-CO7.name=Día del Trabajo
-holiday.es-CO7.date=20200501
+holiday.es-CO7.date=20150501
 holiday.es-CO8.name=La Ascensión del Señor
-holiday.es-CO8.date=20200525
+holiday.es-CO8.date=20150518
 holiday.es-CO9.name=Corpus Christi
-holiday.es-CO9.date=20200615
+holiday.es-CO9.date=20150608
 holiday.es-CO10.name=El Sagrado Corazón de Jesús
-holiday.es-CO10.date=20200622
+holiday.es-CO10.date=20150615
 holiday.es-CO11.name=San Pedro y San Pablo
-holiday.es-CO11.date=20200629
+holiday.es-CO11.date=20150629
 holiday.es-CO12.name=Grito de Independencia
-holiday.es-CO12.date=20200720
+holiday.es-CO12.date=20150720
 holiday.es-CO13.name=Batalla de Boyacá
-holiday.es-CO13.date=20200807
+holiday.es-CO13.date=20150807
 holiday.es-CO14.name=Asunción de la Virgen
-holiday.es-CO14.date=20200817
+holiday.es-CO14.date=20150817
 holiday.es-CO15.name=Día de la Raza
-holiday.es-CO15.date=20201012
+holiday.es-CO15.date=20151012
 holiday.es-CO16.name=Todos los Santos
-holiday.es-CO16.date=20201102
+holiday.es-CO16.date=20151102
 holiday.es-CO17.name=Independencia de Cartagena
-holiday.es-CO17.date=20201116
+holiday.es-CO17.date=20151116
 holiday.es-CO18.name=Inmaculada Concepción
-holiday.es-CO18.date=20201208
+holiday.es-CO18.date=20151208
 holiday.es-CO19.name=Navidad
-holiday.es-CO19.date=20201225
+holiday.es-CO19.date=20151225
 holiday.es-CO20.name=Año Nuevo
-holiday.es-CO20.date=20210101
+holiday.es-CO20.date=20160101
 holiday.es-CO21.name=Día de los Reyes Magos
-holiday.es-CO21.date=20210111
+holiday.es-CO21.date=20160111
 holiday.es-CO22.name=Día de San José
-holiday.es-CO22.date=20210322
+holiday.es-CO22.date=20160321
 holiday.es-CO23.name=Jueves Santo
-holiday.es-CO23.date=20210401
+holiday.es-CO23.date=20160324
 holiday.es-CO24.name=Viernes Santo
-holiday.es-CO24.date=20210402
+holiday.es-CO24.date=20160325
 holiday.es-CO25.name=Domingo de Pascua
-holiday.es-CO25.date=20210404
+holiday.es-CO25.date=20160326
 holiday.es-CO26.name=Día del Trabajo
-holiday.es-CO26.date=20210501
+holiday.es-CO26.date=20160501
 holiday.es-CO27.name=La Ascensión del Señor
-holiday.es-CO27.date=20210517
+holiday.es-CO27.date=20160509
 holiday.es-CO28.name=Corpus Christi
-holiday.es-CO28.date=20210607
+holiday.es-CO28.date=20160530
 holiday.es-CO29.name=El Sagrado Corazón de Jesús
-holiday.es-CO29.date=20210614
+holiday.es-CO29.date=20160606
 holiday.es-CO30.name=San Pedro y San Pablo
-holiday.es-CO30.date=20210705
+holiday.es-CO30.date=20160704
 holiday.es-CO31.name=Grito de Independencia
-holiday.es-CO31.date=20210720
+holiday.es-CO31.date=20160720
 holiday.es-CO32.name=Batalla de Boyacá
-holiday.es-CO32.date=20210807
+holiday.es-CO32.date=20160807
 holiday.es-CO33.name=Asunción de la Virgen
-holiday.es-CO33.date=20210816
+holiday.es-CO33.date=20160815
 holiday.es-CO34.name=Día de la Raza
-holiday.es-CO34.date=20211018
+holiday.es-CO34.date=20161017
 holiday.es-CO35.name=Todos los Santos
-holiday.es-CO35.date=20211101
+holiday.es-CO35.date=20161107
 holiday.es-CO36.name=Independencia de Cartagena
-holiday.es-CO36.date=20211115
+holiday.es-CO36.date=20161114
 holiday.es-CO37.name=Inmaculada Concepción
-holiday.es-CO37.date=20211208
+holiday.es-CO37.date=20161208
 holiday.es-CO38.name=Navidad
-holiday.es-CO38.date=20211225
+holiday.es-CO38.date=20161225
--- a/doc/rc/holidays.es-EC.rc
+++ b/doc/rc/holidays.es-EC.rc
@@ -0,0 +1,75 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/es-EC/2015.json
 # http://holidata.net/es-EC/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.es-EC1.name=Año Nuevo
 holiday.es-EC1.date=20150101
 holiday.es-EC2.name=Año Nuevo
 holiday.es-EC2.date=20150102
 holiday.es-EC3.name=Carnaval
 holiday.es-EC3.date=20150216
 holiday.es-EC4.name=Carnaval
 holiday.es-EC4.date=20150217
 holiday.es-EC5.name=Viernes Santo
 holiday.es-EC5.date=20150403
 holiday.es-EC6.name=Día del Trabajo
 holiday.es-EC6.date=20150501
 holiday.es-EC7.name=Batalla del Pichincha
 holiday.es-EC7.date=20150524
 holiday.es-EC8.name=Primer Grito de Independencia
 holiday.es-EC8.date=20150810
 holiday.es-EC9.name=Independencia de Guayaquil
 holiday.es-EC9.date=20151009
 holiday.es-EC10.name=Día de Difuntos
 holiday.es-EC10.date=20151102
 holiday.es-EC11.name=Independencia de Cuenca
 holiday.es-EC11.date=20151103
 holiday.es-EC12.name=Navidad
 holiday.es-EC12.date=20151225
 holiday.es-EC13.name=Año Nuevo
 holiday.es-EC13.date=20160101
 holiday.es-EC14.name=Carnaval
 holiday.es-EC14.date=20160208
 holiday.es-EC15.name=Carnaval
 holiday.es-EC15.date=20160209
 holiday.es-EC16.name=Viernes Santo
 holiday.es-EC16.date=20160325
 holiday.es-EC17.name=Día del Trabajo
 holiday.es-EC17.date=20160501
 holiday.es-EC18.name=Batalla del Pichincha
 holiday.es-EC18.date=20160524
 holiday.es-EC19.name=Primer Grito de Independencia
 holiday.es-EC19.date=20160810
 holiday.es-EC20.name=Independencia de Guayaquil
 holiday.es-EC20.date=20161009
 holiday.es-EC21.name=Día de Difuntos
 holiday.es-EC21.date=20161102
 holiday.es-EC22.name=Independencia de Cuenca
 holiday.es-EC22.date=20161103
 holiday.es-EC23.name=Navidad
 holiday.es-EC23.date=20161225
--- a/doc/rc/holidays.es-ES.rc
+++ b/doc/rc/holidays.es-ES.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/es-ES/2020.json
+# http://holidata.net/es-ES/2015.json
-# https://holidata.net/es-ES/2021.json
+# http://holidata.net/es-ES/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,59 +23,59 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.es-ES1.name=Año Nuevo
-holiday.es-ES1.date=20200101
+holiday.es-ES1.date=20150101
 holiday.es-ES2.name=Día de los Reyes
-holiday.es-ES2.date=20200106
+holiday.es-ES2.date=20150106
 holiday.es-ES3.name=Viernes Santo
-holiday.es-ES3.date=20200410
+holiday.es-ES3.date=20150403
 holiday.es-ES4.name=Pascua
-holiday.es-ES4.date=20200412
+holiday.es-ES4.date=20150405
 holiday.es-ES5.name=Fiesta del Trabajo
-holiday.es-ES5.date=20200501
+holiday.es-ES5.date=20150501
 holiday.es-ES6.name=Asunción de la Virgen
-holiday.es-ES6.date=20200815
+holiday.es-ES6.date=20150815
 holiday.es-ES7.name=Fiesta Nacional de España
-holiday.es-ES7.date=20201012
+holiday.es-ES7.date=20151012
 holiday.es-ES8.name=Dia de todos los Santos
-holiday.es-ES8.date=20201101
+holiday.es-ES8.date=20151101
 holiday.es-ES9.name=Dia de la Constitución
-holiday.es-ES9.date=20201206
+holiday.es-ES9.date=20151206
 holiday.es-ES10.name=Inmaculada Concepción
-holiday.es-ES10.date=20201208
+holiday.es-ES10.date=20151208
 holiday.es-ES11.name=Noche Buena
-holiday.es-ES11.date=20201224
+holiday.es-ES11.date=20151224
 holiday.es-ES12.name=Navidad
-holiday.es-ES12.date=20201225
+holiday.es-ES12.date=20151225
 holiday.es-ES13.name=Noche Vieja
-holiday.es-ES13.date=20201231
+holiday.es-ES13.date=20151231
 holiday.es-ES14.name=Año Nuevo
-holiday.es-ES14.date=20210101
+holiday.es-ES14.date=20160101
 holiday.es-ES15.name=Día de los Reyes
-holiday.es-ES15.date=20210106
+holiday.es-ES15.date=20160106
 holiday.es-ES16.name=Viernes Santo
-holiday.es-ES16.date=20210402
+holiday.es-ES16.date=20160325
 holiday.es-ES17.name=Pascua
-holiday.es-ES17.date=20210404
+holiday.es-ES17.date=20160327
 holiday.es-ES18.name=Fiesta del Trabajo
-holiday.es-ES18.date=20210501
+holiday.es-ES18.date=20160501
 holiday.es-ES19.name=Asunción de la Virgen
-holiday.es-ES19.date=20210815
+holiday.es-ES19.date=20160815
 holiday.es-ES20.name=Fiesta Nacional de España
-holiday.es-ES20.date=20211012
+holiday.es-ES20.date=20161012
 holiday.es-ES21.name=Dia de todos los Santos
-holiday.es-ES21.date=20211101
+holiday.es-ES21.date=20161101
 holiday.es-ES22.name=Dia de la Constitución
-holiday.es-ES22.date=20211206
+holiday.es-ES22.date=20161206
 holiday.es-ES23.name=Inmaculada Concepción
-holiday.es-ES23.date=20211208
+holiday.es-ES23.date=20161208
 holiday.es-ES24.name=Noche Buena
-holiday.es-ES24.date=20211224
+holiday.es-ES24.date=20161224
 holiday.es-ES25.name=Navidad
-holiday.es-ES25.date=20211225
+holiday.es-ES25.date=20161225
 holiday.es-ES26.name=Noche Vieja
-holiday.es-ES26.date=20211231
+holiday.es-ES26.date=20161231
--- a/doc/rc/holidays.es-MX.rc
+++ b/doc/rc/holidays.es-MX.rc
@@ -0,0 +1,69 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/es-MX/2015.json
 # http://holidata.net/es-MX/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.es-MX1.name=Año Nuevo
 holiday.es-MX1.date=20150101
 holiday.es-MX2.name=Día de la Constitución
 holiday.es-MX2.date=20150202
 holiday.es-MX3.name=Natalicio de Benito Juárez
 holiday.es-MX3.date=20150316
 holiday.es-MX4.name=Jueves Santo
 holiday.es-MX4.date=20150402
 holiday.es-MX5.name=Viernes Santo
 holiday.es-MX5.date=20150403
 holiday.es-MX6.name=Día del Trabajo
 holiday.es-MX6.date=20150501
 holiday.es-MX7.name=Día de la Independencia
 holiday.es-MX7.date=20150916
 holiday.es-MX8.name=Día de la Revolución
 holiday.es-MX8.date=20151116
 holiday.es-MX9.name=Nuestra Señora de Guadalupe
 holiday.es-MX9.date=20151212
 holiday.es-MX10.name=Navidad
 holiday.es-MX10.date=20151225
 holiday.es-MX11.name=Año Nuevo
 holiday.es-MX11.date=20160101
 holiday.es-MX12.name=Día de la Constitución
 holiday.es-MX12.date=20160201
 holiday.es-MX13.name=Natalicio de Benito Juárez
 holiday.es-MX13.date=20160314
 holiday.es-MX14.name=Jueves Santo
 holiday.es-MX14.date=20160324
 holiday.es-MX15.name=Viernes Santo
 holiday.es-MX15.date=20160325
 holiday.es-MX16.name=Día del Trabajo
 holiday.es-MX16.date=20160501
 holiday.es-MX17.name=Día de la Independencia
 holiday.es-MX17.date=20160916
 holiday.es-MX18.name=Día de la Revolución
 holiday.es-MX18.date=20161121
 holiday.es-MX19.name=Nuestra Señora de Guadalupe
 holiday.es-MX19.date=20161212
 holiday.es-MX20.name=Navidad
 holiday.es-MX20.date=20161225
--- a/doc/rc/holidays.es-US.rc
+++ b/doc/rc/holidays.es-US.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/es-US/2020.json
+# http://holidata.net/es-US/2015.json
-# https://holidata.net/es-US/2021.json
+# http://holidata.net/es-US/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,55 +23,51 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.es-US1.name=Año Neuvo
-holiday.es-US1.date=20200101
+holiday.es-US1.date=20150101
 holiday.es-US2.name=Cumpleaños de Martin Luther King, Jr.
-holiday.es-US2.date=20200120
+holiday.es-US2.date=20150119
 holiday.es-US3.name=Día del Presidente
-holiday.es-US3.date=20200217
+holiday.es-US3.date=20150216
 holiday.es-US4.name=Día del Patriota
-holiday.es-US4.date=20200420
+holiday.es-US4.date=20150420
 holiday.es-US5.name=Día de los Caídos
-holiday.es-US5.date=20200525
+holiday.es-US5.date=20150525
 holiday.es-US6.name=Día de la Independiencia
-holiday.es-US6.date=20200704
+holiday.es-US6.date=20150704
 holiday.es-US7.name=Día del Trabajo
-holiday.es-US7.date=20200907
+holiday.es-US7.date=20150907
 holiday.es-US8.name=Día de Columbus
-holiday.es-US8.date=20201012
+holiday.es-US8.date=20151012
 holiday.es-US9.name=Día de los Veteranos
-holiday.es-US9.date=20201111
+holiday.es-US9.date=20151111
 holiday.es-US10.name=Día de Acción de Gracias
-holiday.es-US10.date=20201126
+holiday.es-US10.date=20151126
-holiday.es-US11.name=Día después de Acción de Gracias
+holiday.es-US11.name=Navidad
-holiday.es-US11.date=20201127
+holiday.es-US11.date=20151225
-holiday.es-US12.name=Nochebuena
+holiday.es-US12.name=Año Neuvo
-holiday.es-US12.date=20201224
+holiday.es-US12.date=20160101
-holiday.es-US13.name=Navidad
+holiday.es-US13.name=Cumpleaños de Martin Luther King, Jr.
-holiday.es-US13.date=20201225
+holiday.es-US13.date=20160118
-holiday.es-US14.name=Año Neuvo
+holiday.es-US14.name=Día del Presidente
-holiday.es-US14.date=20210101
+holiday.es-US14.date=20160215
-holiday.es-US15.name=Cumpleaños de Martin Luther King, Jr.
+holiday.es-US15.name=Día del Patriota
-holiday.es-US15.date=20210118
+holiday.es-US15.date=20160418
-holiday.es-US16.name=Día del Presidente
+holiday.es-US16.name=Día de los Caídos
-holiday.es-US16.date=20210215
+holiday.es-US16.date=20160530
-holiday.es-US17.name=Día del Patriota
+holiday.es-US17.name=Día de la Independiencia
-holiday.es-US17.date=20210419
+holiday.es-US17.date=20160704
-holiday.es-US18.name=Día de los Caídos
+holiday.es-US18.name=Día del Trabajo
-holiday.es-US18.date=20210531
+holiday.es-US18.date=20160905
-holiday.es-US19.name=Día de la Independiencia
+holiday.es-US19.name=Día de Columbus
-holiday.es-US19.date=20210704
+holiday.es-US19.date=20161010
-holiday.es-US20.name=Día del Trabajo
+holiday.es-US20.name=Día de los Veteranos
-holiday.es-US20.date=20210906
+holiday.es-US20.date=20161111
-holiday.es-US21.name=Día de Columbus
+holiday.es-US21.name=Día de Acción de Gracias
-holiday.es-US21.date=20211011
+holiday.es-US21.date=20161124
-holiday.es-US22.name=Día de los Veteranos
+holiday.es-US22.name=Navidad
-holiday.es-US22.date=20211111
+holiday.es-US22.date=20161225
 holiday.es-US23.name=Día de Acción de Gracias
 holiday.es-US23.date=20211125
 holiday.es-US24.name=Navidad
 holiday.es-US24.date=20211225
--- a/doc/rc/holidays.et-EE.rc
+++ b/doc/rc/holidays.et-EE.rc
@@ -0,0 +1,77 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/et-EE/2015.json
 # http://holidata.net/et-EE/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.et-EE1.name=uusaasta
 holiday.et-EE1.date=20150101
 holiday.et-EE2.name=iseseisvuspäev
 holiday.et-EE2.date=20150224
 holiday.et-EE3.name=suur reede
 holiday.et-EE3.date=20150403
 holiday.et-EE4.name=ülestõusmispühade 1. püha
 holiday.et-EE4.date=20150405
 holiday.et-EE5.name=kevadpüha
 holiday.et-EE5.date=20150501
 holiday.et-EE6.name=nelipühade 1. püha
 holiday.et-EE6.date=20150524
 holiday.et-EE7.name=võidupüha
 holiday.et-EE7.date=20150623
 holiday.et-EE8.name=jaanipäev
 holiday.et-EE8.date=20150624
 holiday.et-EE9.name=taasiseseisvumispäev
 holiday.et-EE9.date=20150820
 holiday.et-EE10.name=jõululaupäev
 holiday.et-EE10.date=20151224
 holiday.et-EE11.name=esimene jõulupüha
 holiday.et-EE11.date=20151225
 holiday.et-EE12.name=teine jõulupüha
 holiday.et-EE12.date=20151226
 holiday.et-EE13.name=uusaasta
 holiday.et-EE13.date=20160101
 holiday.et-EE14.name=iseseisvuspäev
 holiday.et-EE14.date=20160224
 holiday.et-EE15.name=suur reede
 holiday.et-EE15.date=20160325
 holiday.et-EE16.name=ülestõusmispühade 1. püha
 holiday.et-EE16.date=20160327
 holiday.et-EE17.name=kevadpüha
 holiday.et-EE17.date=20160501
 holiday.et-EE18.name=nelipühade 1. püha
 holiday.et-EE18.date=20160515
 holiday.et-EE19.name=võidupüha
 holiday.et-EE19.date=20160623
 holiday.et-EE20.name=jaanipäev
 holiday.et-EE20.date=20160624
 holiday.et-EE21.name=taasiseseisvumispäev
 holiday.et-EE21.date=20160820
 holiday.et-EE22.name=jõululaupäev
 holiday.et-EE22.date=20161224
 holiday.et-EE23.name=esimene jõulupüha
 holiday.et-EE23.date=20161225
 holiday.et-EE24.name=teine jõulupüha
 holiday.et-EE24.date=20161226
--- a/doc/rc/holidays.fi-FI.rc
+++ b/doc/rc/holidays.fi-FI.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/fi-FI/2020.json
+# http://holidata.net/fi-FI/2015.json
-# https://holidata.net/fi-FI/2021.json
+# http://holidata.net/fi-FI/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,59 +23,67 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.fi-FI1.name=Uudenvuodenpäivä
-holiday.fi-FI1.date=20200101
+holiday.fi-FI1.date=20150101
 holiday.fi-FI2.name=Loppiainen
-holiday.fi-FI2.date=20200106
+holiday.fi-FI2.date=20150106
 holiday.fi-FI3.name=Pitkäperjantai
-holiday.fi-FI3.date=20200410
+holiday.fi-FI3.date=20150403
 holiday.fi-FI4.name=Pääsiäispäivä
-holiday.fi-FI4.date=20200412
+holiday.fi-FI4.date=20150405
 holiday.fi-FI5.name=2. pääsiäispäivä
-holiday.fi-FI5.date=20200413
+holiday.fi-FI5.date=20150406
 holiday.fi-FI6.name=Vappu
-holiday.fi-FI6.date=20200501
+holiday.fi-FI6.date=20150501
 holiday.fi-FI7.name=Helatorstai
-holiday.fi-FI7.date=20200521
+holiday.fi-FI7.date=20150514
 holiday.fi-FI8.name=Helluntaipäivä
-holiday.fi-FI8.date=20200531
+holiday.fi-FI8.date=20150524
-holiday.fi-FI9.name=Juhannuspäivä
+holiday.fi-FI9.name=Juhannusaatto
-holiday.fi-FI9.date=20200620
+holiday.fi-FI9.date=20150619
-holiday.fi-FI10.name=Pyhäinpäivä
+holiday.fi-FI10.name=Juhannuspäivä
-holiday.fi-FI10.date=20201031
+holiday.fi-FI10.date=20150620
-holiday.fi-FI11.name=Itsenäisyyspäivä
+holiday.fi-FI11.name=Pyhäinpäivä
-holiday.fi-FI11.date=20201206
+holiday.fi-FI11.date=20151031
-holiday.fi-FI12.name=Joulupäivä
+holiday.fi-FI12.name=Itsenäisyyspäivä
-holiday.fi-FI12.date=20201225
+holiday.fi-FI12.date=20151206
-holiday.fi-FI13.name=Tapaninpäivä
+holiday.fi-FI13.name=Jouluaatto
-holiday.fi-FI13.date=20201226
+holiday.fi-FI13.date=20151224
-holiday.fi-FI14.name=Uudenvuodenpäivä
+holiday.fi-FI14.name=Joulupäivä
-holiday.fi-FI14.date=20210101
+holiday.fi-FI14.date=20151225
-holiday.fi-FI15.name=Loppiainen
+holiday.fi-FI15.name=2. joulupäivä
-holiday.fi-FI15.date=20210106
+holiday.fi-FI15.date=20151226
-holiday.fi-FI16.name=Pitkäperjantai
+holiday.fi-FI16.name=Uudenvuodenpäivä
-holiday.fi-FI16.date=20210402
+holiday.fi-FI16.date=20160101
-holiday.fi-FI17.name=Pääsiäispäivä
+holiday.fi-FI17.name=Loppiainen
-holiday.fi-FI17.date=20210404
+holiday.fi-FI17.date=20160106
-holiday.fi-FI18.name=2. pääsiäispäivä
+holiday.fi-FI18.name=Pitkäperjantai
-holiday.fi-FI18.date=20210405
+holiday.fi-FI18.date=20160325
-holiday.fi-FI19.name=Vappu
+holiday.fi-FI19.name=Pääsiäispäivä
-holiday.fi-FI19.date=20210501
+holiday.fi-FI19.date=20160327
-holiday.fi-FI20.name=Helatorstai
+holiday.fi-FI20.name=2. pääsiäispäivä
-holiday.fi-FI20.date=20210513
+holiday.fi-FI20.date=20160328
-holiday.fi-FI21.name=Helluntaipäivä
+holiday.fi-FI21.name=Vappu
-holiday.fi-FI21.date=20210523
+holiday.fi-FI21.date=20160501
-holiday.fi-FI22.name=Juhannuspäivä
+holiday.fi-FI22.name=Helatorstai
-holiday.fi-FI22.date=20210626
+holiday.fi-FI22.date=20160505
-holiday.fi-FI23.name=Pyhäinpäivä
+holiday.fi-FI23.name=Helluntaipäivä
-holiday.fi-FI23.date=20211106
+holiday.fi-FI23.date=20160515
-holiday.fi-FI24.name=Itsenäisyyspäivä
+holiday.fi-FI24.name=Juhannusaatto
-holiday.fi-FI24.date=20211206
+holiday.fi-FI24.date=20160624
-holiday.fi-FI25.name=Joulupäivä
+holiday.fi-FI25.name=Juhannuspäivä
-holiday.fi-FI25.date=20211225
+holiday.fi-FI25.date=20160625
-holiday.fi-FI26.name=Tapaninpäivä
+holiday.fi-FI26.name=Pyhäinpäivä
-holiday.fi-FI26.date=20211226
+holiday.fi-FI26.date=20161105
 holiday.fi-FI27.name=Itsenäisyyspäivä
 holiday.fi-FI27.date=20161206
 holiday.fi-FI28.name=Jouluaatto
 holiday.fi-FI28.date=20161224
 holiday.fi-FI29.name=Joulupäivä
 holiday.fi-FI29.date=20161225
 holiday.fi-FI30.name=2. joulupäivä
 holiday.fi-FI30.date=20161226
--- a/doc/rc/holidays.fr-BE.rc
+++ b/doc/rc/holidays.fr-BE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/fr-BE/2020.json
+# http://holidata.net/fr-BE/2015.json
-# https://holidata.net/fr-BE/2021.json
+# http://holidata.net/fr-BE/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,55 +23,55 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.fr-BE1.name=Nouvel An
-holiday.fr-BE1.date=20200101
+holiday.fr-BE1.date=20150101
 holiday.fr-BE2.name=Pâques
-holiday.fr-BE2.date=20200412
+holiday.fr-BE2.date=20150405
 holiday.fr-BE3.name=Lundi de Pâques
-holiday.fr-BE3.date=20200413
+holiday.fr-BE3.date=20150406
 holiday.fr-BE4.name=Fête du Travail
-holiday.fr-BE4.date=20200501
+holiday.fr-BE4.date=20150501
 holiday.fr-BE5.name=Ascension
-holiday.fr-BE5.date=20200521
+holiday.fr-BE5.date=20150514
 holiday.fr-BE6.name=Pentecôte
-holiday.fr-BE6.date=20200531
+holiday.fr-BE6.date=20150524
 holiday.fr-BE7.name=Lundi de Pentecôte
-holiday.fr-BE7.date=20200601
+holiday.fr-BE7.date=20150525
 holiday.fr-BE8.name=Fête nationale
-holiday.fr-BE8.date=20200721
+holiday.fr-BE8.date=20150721
 holiday.fr-BE9.name=Assomption
-holiday.fr-BE9.date=20200815
+holiday.fr-BE9.date=20150815
 holiday.fr-BE10.name=Toussaint
-holiday.fr-BE10.date=20201101
+holiday.fr-BE10.date=20151101
 holiday.fr-BE11.name=Jour de l'armistice
-holiday.fr-BE11.date=20201111
+holiday.fr-BE11.date=20151111
 holiday.fr-BE12.name=Noël
-holiday.fr-BE12.date=20201225
+holiday.fr-BE12.date=20151225
 holiday.fr-BE13.name=Nouvel An
-holiday.fr-BE13.date=20210101
+holiday.fr-BE13.date=20160101
 holiday.fr-BE14.name=Pâques
-holiday.fr-BE14.date=20210404
+holiday.fr-BE14.date=20160527
 holiday.fr-BE15.name=Lundi de Pâques
-holiday.fr-BE15.date=20210405
+holiday.fr-BE15.date=20160528
 holiday.fr-BE16.name=Fête du Travail
-holiday.fr-BE16.date=20210501
+holiday.fr-BE16.date=20160501
 holiday.fr-BE17.name=Ascension
-holiday.fr-BE17.date=20210513
+holiday.fr-BE17.date=20160505
 holiday.fr-BE18.name=Pentecôte
-holiday.fr-BE18.date=20210523
+holiday.fr-BE18.date=20160515
 holiday.fr-BE19.name=Lundi de Pentecôte
-holiday.fr-BE19.date=20210524
+holiday.fr-BE19.date=20160516
 holiday.fr-BE20.name=Fête nationale
-holiday.fr-BE20.date=20210721
+holiday.fr-BE20.date=20160721
 holiday.fr-BE21.name=Assomption
-holiday.fr-BE21.date=20210815
+holiday.fr-BE21.date=20160815
 holiday.fr-BE22.name=Toussaint
-holiday.fr-BE22.date=20211101
+holiday.fr-BE22.date=20161101
 holiday.fr-BE23.name=Jour de l'armistice
-holiday.fr-BE23.date=20211111
+holiday.fr-BE23.date=20161111
 holiday.fr-BE24.name=Noël
-holiday.fr-BE24.date=20211225
+holiday.fr-BE24.date=20161225
--- a/doc/rc/holidays.fr-FR.rc
+++ b/doc/rc/holidays.fr-FR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/fr-FR/2020.json
+# http://holidata.net/fr-FR/2015.json
-# https://holidata.net/fr-FR/2021.json
+# http://holidata.net/fr-FR/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,55 +23,51 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.fr-FR1.name=Jour de l'an
-holiday.fr-FR1.date=20200101
+holiday.fr-FR1.date=20150101
 holiday.fr-FR2.name=Lundi de Pâques
-holiday.fr-FR2.date=20200413
+holiday.fr-FR2.date=20150406
 holiday.fr-FR3.name=Fête du premier mai
-holiday.fr-FR3.date=20200501
+holiday.fr-FR3.date=20150501
 holiday.fr-FR4.name=Armistice 1945
-holiday.fr-FR4.date=20200508
+holiday.fr-FR4.date=20150508
 holiday.fr-FR5.name=Ascencion
-holiday.fr-FR5.date=20200521
+holiday.fr-FR5.date=20150514
 holiday.fr-FR6.name=Pentecôte
-holiday.fr-FR6.date=20200531
+holiday.fr-FR6.date=20150524
-holiday.fr-FR7.name=Lundi de Pentecôte
+holiday.fr-FR7.name=Fête nationale
-holiday.fr-FR7.date=20200601
+holiday.fr-FR7.date=20150714
-holiday.fr-FR8.name=Fête nationale
+holiday.fr-FR8.name=Assomption
-holiday.fr-FR8.date=20200714
+holiday.fr-FR8.date=20150815
-holiday.fr-FR9.name=Assomption
+holiday.fr-FR9.name=Toussaint
-holiday.fr-FR9.date=20200815
+holiday.fr-FR9.date=20151101
-holiday.fr-FR10.name=Toussaint
+holiday.fr-FR10.name=Armistice 1918
-holiday.fr-FR10.date=20201101
+holiday.fr-FR10.date=20151111
-holiday.fr-FR11.name=Armistice 1918
+holiday.fr-FR11.name=Noël
-holiday.fr-FR11.date=20201111
+holiday.fr-FR11.date=20151225
-holiday.fr-FR12.name=Noël
+holiday.fr-FR12.name=Jour de l'an
-holiday.fr-FR12.date=20201225
+holiday.fr-FR12.date=20160101
-holiday.fr-FR13.name=Jour de l'an
+holiday.fr-FR13.name=Lundi de Pâques
-holiday.fr-FR13.date=20210101
+holiday.fr-FR13.date=20160328
-holiday.fr-FR14.name=Lundi de Pâques
+holiday.fr-FR14.name=Fête du premier mai
-holiday.fr-FR14.date=20210405
+holiday.fr-FR14.date=20160501
-holiday.fr-FR15.name=Fête du premier mai
+holiday.fr-FR15.name=Armistice 1945
-holiday.fr-FR15.date=20210501
+holiday.fr-FR15.date=20160508
-holiday.fr-FR16.name=Armistice 1945
+holiday.fr-FR16.name=Ascencion
-holiday.fr-FR16.date=20210508
+holiday.fr-FR16.date=20160505
-holiday.fr-FR17.name=Ascencion
+holiday.fr-FR17.name=Pentecôte
-holiday.fr-FR17.date=20210513
+holiday.fr-FR17.date=20160515
-holiday.fr-FR18.name=Pentecôte
+holiday.fr-FR18.name=Fête nationale
-holiday.fr-FR18.date=20210523
+holiday.fr-FR18.date=20160714
-holiday.fr-FR19.name=Lundi de Pentecôte
+holiday.fr-FR19.name=Assomption
-holiday.fr-FR19.date=20210524
+holiday.fr-FR19.date=20160815
-holiday.fr-FR20.name=Fête nationale
+holiday.fr-FR20.name=Toussaint
-holiday.fr-FR20.date=20210714
+holiday.fr-FR20.date=20161101
-holiday.fr-FR21.name=Assomption
+holiday.fr-FR21.name=Armistice 1918
-holiday.fr-FR21.date=20210815
+holiday.fr-FR21.date=20161111
-holiday.fr-FR22.name=Toussaint
+holiday.fr-FR22.name=Noël
-holiday.fr-FR22.date=20211101
+holiday.fr-FR22.date=20161225
 holiday.fr-FR23.name=Armistice 1918
 holiday.fr-FR23.date=20211111
 holiday.fr-FR24.name=Noël
 holiday.fr-FR24.date=20211225
--- a/doc/rc/holidays.ga-IE.rc
+++ b/doc/rc/holidays.ga-IE.rc
@@ -0,0 +1,65 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/ga-IE/2015.json
 # http://holidata.net/ga-IE/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.ga-IE1.name=Lá Caille or Lá Bliana Nua
 holiday.ga-IE1.date=20150101
 holiday.ga-IE2.name=Lá Fhéile Pádraig
 holiday.ga-IE2.date=20150317
 holiday.ga-IE3.name=Luan Cásca
 holiday.ga-IE3.date=20150406
 holiday.ga-IE4.name=Lá an Lucht Oibre
 holiday.ga-IE4.date=20150504
 holiday.ga-IE5.name=Lá Saoire i mí Mheitheamh
 holiday.ga-IE5.date=20150601
 holiday.ga-IE6.name=Lá Saoire i mí Lúnasa
 holiday.ga-IE6.date=20150803
 holiday.ga-IE7.name=Lá Saoire i mí Dheireadh Fómhair
 holiday.ga-IE7.date=20151026
 holiday.ga-IE8.name=Lá Nollag
 holiday.ga-IE8.date=20151225
 holiday.ga-IE9.name=Lá Fhéile Stiofáin or Lá an Dreoilín
 holiday.ga-IE9.date=20151226
 holiday.ga-IE10.name=Lá Caille or Lá Bliana Nua
 holiday.ga-IE10.date=20160101
 holiday.ga-IE11.name=Lá Fhéile Pádraig
 holiday.ga-IE11.date=20160317
 holiday.ga-IE12.name=Luan Cásca
 holiday.ga-IE12.date=20160328
 holiday.ga-IE13.name=Lá an Lucht Oibre
 holiday.ga-IE13.date=20160502
 holiday.ga-IE14.name=Lá Saoire i mí Mheitheamh
 holiday.ga-IE14.date=20160606
 holiday.ga-IE15.name=Lá Saoire i mí Lúnasa
 holiday.ga-IE15.date=20160801
 holiday.ga-IE16.name=Lá Saoire i mí Dheireadh Fómhair
 holiday.ga-IE16.date=20161031
 holiday.ga-IE17.name=Lá Nollag
 holiday.ga-IE17.date=20161225
 holiday.ga-IE18.name=Lá Fhéile Stiofáin or Lá an Dreoilín
 holiday.ga-IE18.date=20161226
--- a/doc/rc/holidays.hr-HR.rc
+++ b/doc/rc/holidays.hr-HR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/hr-HR/2020.json
+# http://holidata.net/hr-HR/2015.json
-# https://holidata.net/hr-HR/2021.json
+# http://holidata.net/hr-HR/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,67 +23,63 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.hr-HR1.name=Nova Godina
-holiday.hr-HR1.date=20200101
+holiday.hr-HR1.date=20150101
 holiday.hr-HR2.name=Bogojavljenje
-holiday.hr-HR2.date=20200106
+holiday.hr-HR2.date=20150106
 holiday.hr-HR3.name=Uskrs
-holiday.hr-HR3.date=20200412
+holiday.hr-HR3.date=20150405
 holiday.hr-HR4.name=Uskrsni ponedjeljak
-holiday.hr-HR4.date=20200413
+holiday.hr-HR4.date=20150406
-holiday.hr-HR5.name=Praznik rada
+holiday.hr-HR5.name=Međunarodni praznik rada
-holiday.hr-HR5.date=20200501
+holiday.hr-HR5.date=20150501
 holiday.hr-HR6.name=Tijelovo
-holiday.hr-HR6.date=20200611
+holiday.hr-HR6.date=20150604
 holiday.hr-HR7.name=Dan antifašističke borbe
-holiday.hr-HR7.date=20200622
+holiday.hr-HR7.date=20150622
 holiday.hr-HR8.name=Dan državnosti
-holiday.hr-HR8.date=20200625
+holiday.hr-HR8.date=20150625
-holiday.hr-HR9.name=Dan pobjede i domovinske zahvalnosti i Dan hrvatskih branitelja
+holiday.hr-HR9.name=Dan pobjede
-holiday.hr-HR9.date=20200805
+holiday.hr-HR9.date=20150805
 holiday.hr-HR10.name=Velika Gospa
-holiday.hr-HR10.date=20200815
+holiday.hr-HR10.date=20150815
 holiday.hr-HR11.name=Dan neovisnosti
-holiday.hr-HR11.date=20201008
+holiday.hr-HR11.date=20151008
-holiday.hr-HR12.name=Svi sveti
+holiday.hr-HR12.name=Dan svih svetih
-holiday.hr-HR12.date=20201101
+holiday.hr-HR12.date=20151101
-holiday.hr-HR13.name=Dan sjećanja na žrtve Domovinskog rata i Dan sjećanja na žrtvu Vukovara i Škabrnje
+holiday.hr-HR13.name=Božić
-holiday.hr-HR13.date=20201118
+holiday.hr-HR13.date=20151225
-holiday.hr-HR14.name=Božić
+holiday.hr-HR14.name=Prvi dan po Božiću
-holiday.hr-HR14.date=20201225
+holiday.hr-HR14.date=20151226
-holiday.hr-HR15.name=Sveti Stjepan
+holiday.hr-HR15.name=Nova Godina
-holiday.hr-HR15.date=20201226
+holiday.hr-HR15.date=20160101
-holiday.hr-HR16.name=Nova Godina
+holiday.hr-HR16.name=Bogojavljenje
-holiday.hr-HR16.date=20210101
+holiday.hr-HR16.date=20160106
-holiday.hr-HR17.name=Bogojavljenje
+holiday.hr-HR17.name=Uskrs
-holiday.hr-HR17.date=20210106
+holiday.hr-HR17.date=20160327
-holiday.hr-HR18.name=Uskrs
+holiday.hr-HR18.name=Uskrsni ponedjeljak
-holiday.hr-HR18.date=20210404
+holiday.hr-HR18.date=20160328
-holiday.hr-HR19.name=Uskrsni ponedjeljak
+holiday.hr-HR19.name=Međunarodni praznik rada
-holiday.hr-HR19.date=20210405
+holiday.hr-HR19.date=20160501
-holiday.hr-HR20.name=Praznik rada
+holiday.hr-HR20.name=Tijelovo
-holiday.hr-HR20.date=20210501
+holiday.hr-HR20.date=20160526
-holiday.hr-HR21.name=Tijelovo
+holiday.hr-HR21.name=Dan antifašističke borbe
-holiday.hr-HR21.date=20210603
+holiday.hr-HR21.date=20160622
-holiday.hr-HR22.name=Dan antifašističke borbe
+holiday.hr-HR22.name=Dan državnosti
-holiday.hr-HR22.date=20210622
+holiday.hr-HR22.date=20160625
-holiday.hr-HR23.name=Dan državnosti
+holiday.hr-HR23.name=Dan pobjede
-holiday.hr-HR23.date=20210625
+holiday.hr-HR23.date=20160805
-holiday.hr-HR24.name=Dan pobjede i domovinske zahvalnosti i Dan hrvatskih branitelja
+holiday.hr-HR24.name=Velika Gospa
-holiday.hr-HR24.date=20210805
+holiday.hr-HR24.date=20160815
-holiday.hr-HR25.name=Velika Gospa
+holiday.hr-HR25.name=Dan neovisnosti
-holiday.hr-HR25.date=20210815
+holiday.hr-HR25.date=20161008
-holiday.hr-HR26.name=Dan neovisnosti
+holiday.hr-HR26.name=Dan svih svetih
-holiday.hr-HR26.date=20211008
+holiday.hr-HR26.date=20161101
-holiday.hr-HR27.name=Svi sveti
+holiday.hr-HR27.name=Božić
-holiday.hr-HR27.date=20211101
+holiday.hr-HR27.date=20161225
-holiday.hr-HR28.name=Dan sjećanja na žrtve Domovinskog rata i Dan sjećanja na žrtvu Vukovara i Škabrnje
+holiday.hr-HR28.name=Prvi dan po Božiću
-holiday.hr-HR28.date=20211118
+holiday.hr-HR28.date=20161226
 holiday.hr-HR29.name=Božić
 holiday.hr-HR29.date=20211225
 holiday.hr-HR30.name=Sveti Stjepan
 holiday.hr-HR30.date=20211226
--- a/doc/rc/holidays.is-IS.rc
+++ b/doc/rc/holidays.is-IS.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/is-IS/2020.json
+# http://holidata.net/is-IS/2015.json
-# https://holidata.net/is-IS/2021.json
+# http://holidata.net/is-IS/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,71 +23,67 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.is-IS1.name=Nýársdagur
-holiday.is-IS1.date=20200101
+holiday.is-IS1.date=20150101
 holiday.is-IS2.name=Skírdagur
-holiday.is-IS2.date=20200409
+holiday.is-IS2.date=20150402
-holiday.is-IS3.name=Föstudagurinn langi
+holiday.is-IS3.name=Föstudaginn langi
-holiday.is-IS3.date=20200410
+holiday.is-IS3.date=20150403
 holiday.is-IS4.name=Páskadagur
-holiday.is-IS4.date=20200412
+holiday.is-IS4.date=20150405
-holiday.is-IS5.name=Annar dagur páska
+holiday.is-IS5.name=Annar í páskum
-holiday.is-IS5.date=20200413
+holiday.is-IS5.date=20150406
 holiday.is-IS6.name=Sumardagurinn fyrsti
-holiday.is-IS6.date=20200423
+holiday.is-IS6.date=20150423
 holiday.is-IS7.name=Verkalýðsdagurinn
-holiday.is-IS7.date=20200501
+holiday.is-IS7.date=20150501
 holiday.is-IS8.name=Uppstigningardagur
-holiday.is-IS8.date=20200521
+holiday.is-IS8.date=20150514
-holiday.is-IS9.name=Hvítasunnudagur
+holiday.is-IS9.name=Annar í hvítasunnu
-holiday.is-IS9.date=20200531
+holiday.is-IS9.date=20150525
-holiday.is-IS10.name=Annar dagur hvítasunnu
+holiday.is-IS10.name=Lýðveldisdagurinn
-holiday.is-IS10.date=20200601
+holiday.is-IS10.date=20150617
-holiday.is-IS11.name=Þjóðhátíðardagurinn
+holiday.is-IS11.name=Frídagur verslunarmanna
-holiday.is-IS11.date=20200617
+holiday.is-IS11.date=20150803
-holiday.is-IS12.name=Frídagur verslunarmanna
+holiday.is-IS12.name=Jól
-holiday.is-IS12.date=20200803
+holiday.is-IS12.date=20151224
-holiday.is-IS13.name=Aðfangadagur jóla
+holiday.is-IS13.name=Jól
-holiday.is-IS13.date=20201224
+holiday.is-IS13.date=20151225
-holiday.is-IS14.name=Jóladagur
+holiday.is-IS14.name=Jól
-holiday.is-IS14.date=20201225
+holiday.is-IS14.date=20151226
-holiday.is-IS15.name=Annar dagur jóla
+holiday.is-IS15.name=Gamlárskvöld
-holiday.is-IS15.date=20201226
+holiday.is-IS15.date=20151231
-holiday.is-IS16.name=Gamlársdagur
+holiday.is-IS16.name=Nýársdagur
-holiday.is-IS16.date=20201231
+holiday.is-IS16.date=20160101
-holiday.is-IS17.name=Nýársdagur
+holiday.is-IS17.name=Skírdagur
-holiday.is-IS17.date=20210101
+holiday.is-IS17.date=20160324
-holiday.is-IS18.name=Skírdagur
+holiday.is-IS18.name=Föstudaginn langi
-holiday.is-IS18.date=20210401
+holiday.is-IS18.date=20160325
-holiday.is-IS19.name=Föstudagurinn langi
+holiday.is-IS19.name=Páskadagur
-holiday.is-IS19.date=20210402
+holiday.is-IS19.date=20160327
-holiday.is-IS20.name=Páskadagur
+holiday.is-IS20.name=Annar í páskum
-holiday.is-IS20.date=20210404
+holiday.is-IS20.date=20160328
-holiday.is-IS21.name=Annar dagur páska
+holiday.is-IS21.name=Sumardagurinn fyrsti
-holiday.is-IS21.date=20210405
+holiday.is-IS21.date=20160421
-holiday.is-IS22.name=Sumardagurinn fyrsti
+holiday.is-IS22.name=Verkalýðsdagurinn
-holiday.is-IS22.date=20210422
+holiday.is-IS22.date=20160501
-holiday.is-IS23.name=Verkalýðsdagurinn
+holiday.is-IS23.name=Uppstigningardagur
-holiday.is-IS23.date=20210501
+holiday.is-IS23.date=20160505
-holiday.is-IS24.name=Uppstigningardagur
+holiday.is-IS24.name=Annar í hvítasunnu
-holiday.is-IS24.date=20210513
+holiday.is-IS24.date=20160516
-holiday.is-IS25.name=Hvítasunnudagur
+holiday.is-IS25.name=Lýðveldisdagurinn
-holiday.is-IS25.date=20210523
+holiday.is-IS25.date=20160617
-holiday.is-IS26.name=Annar dagur hvítasunnu
+holiday.is-IS26.name=Frídagur verslunarmanna
-holiday.is-IS26.date=20210524
+holiday.is-IS26.date=20160801
-holiday.is-IS27.name=Þjóðhátíðardagurinn
+holiday.is-IS27.name=Jól
-holiday.is-IS27.date=20210617
+holiday.is-IS27.date=20161224
-holiday.is-IS28.name=Frídagur verslunarmanna
+holiday.is-IS28.name=Jól
-holiday.is-IS28.date=20210802
+holiday.is-IS28.date=20161225
-holiday.is-IS29.name=Aðfangadagur jóla
+holiday.is-IS29.name=Jól
-holiday.is-IS29.date=20211224
+holiday.is-IS29.date=20161226
-holiday.is-IS30.name=Jóladagur
+holiday.is-IS30.name=Gamlárskvöld
-holiday.is-IS30.date=20211225
+holiday.is-IS30.date=20161231
 holiday.is-IS31.name=Annar dagur jóla
 holiday.is-IS31.date=20211226
 holiday.is-IS32.name=Gamlársdagur
 holiday.is-IS32.date=20211231
--- a/doc/rc/holidays.it-IT.rc
+++ b/doc/rc/holidays.it-IT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/it-IT/2020.json
+# http://holidata.net/it-IT/2015.json
-# https://holidata.net/it-IT/2021.json
+# http://holidata.net/it-IT/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,55 +23,55 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.it-IT1.name=Capodanno
-holiday.it-IT1.date=20200101
+holiday.it-IT1.date=20150101
 holiday.it-IT2.name=Epifania
-holiday.it-IT2.date=20200106
+holiday.it-IT2.date=20150106
-holiday.it-IT3.name=Pasqua
+holiday.it-IT3.name=Carnevale
-holiday.it-IT3.date=20200412
+holiday.it-IT3.date=20150217
-holiday.it-IT4.name=Pasquetta
+holiday.it-IT4.name=Pasqua
-holiday.it-IT4.date=20200413
+holiday.it-IT4.date=20150405
 holiday.it-IT5.name=Festa della liberazione
-holiday.it-IT5.date=20200425
+holiday.it-IT5.date=20150425
 holiday.it-IT6.name=Festa del lavoro
-holiday.it-IT6.date=20200501
+holiday.it-IT6.date=20150501
 holiday.it-IT7.name=Festa della repubblica
-holiday.it-IT7.date=20200602
+holiday.it-IT7.date=20150602
 holiday.it-IT8.name=Assunzione (ferragosto)
-holiday.it-IT8.date=20200815
+holiday.it-IT8.date=20150815
 holiday.it-IT9.name=Ognissanti
-holiday.it-IT9.date=20201101
+holiday.it-IT9.date=20151101
 holiday.it-IT10.name=Immacolata concezione
-holiday.it-IT10.date=20201208
+holiday.it-IT10.date=20151208
 holiday.it-IT11.name=Natale
-holiday.it-IT11.date=20201225
+holiday.it-IT11.date=20151225
 holiday.it-IT12.name=S.to Stefano
-holiday.it-IT12.date=20201226
+holiday.it-IT12.date=20151226
 holiday.it-IT13.name=Capodanno
-holiday.it-IT13.date=20210101
+holiday.it-IT13.date=20160101
 holiday.it-IT14.name=Epifania
-holiday.it-IT14.date=20210106
+holiday.it-IT14.date=20160106
-holiday.it-IT15.name=Pasqua
+holiday.it-IT15.name=Carnevale
-holiday.it-IT15.date=20210404
+holiday.it-IT15.date=20160209
-holiday.it-IT16.name=Pasquetta
+holiday.it-IT16.name=Pasqua
-holiday.it-IT16.date=20210405
+holiday.it-IT16.date=20160327
 holiday.it-IT17.name=Festa della liberazione
-holiday.it-IT17.date=20210425
+holiday.it-IT17.date=20160425
 holiday.it-IT18.name=Festa del lavoro
-holiday.it-IT18.date=20210501
+holiday.it-IT18.date=20160501
 holiday.it-IT19.name=Festa della repubblica
-holiday.it-IT19.date=20210602
+holiday.it-IT19.date=20160602
 holiday.it-IT20.name=Assunzione (ferragosto)
-holiday.it-IT20.date=20210815
+holiday.it-IT20.date=20160815
 holiday.it-IT21.name=Ognissanti
-holiday.it-IT21.date=20211101
+holiday.it-IT21.date=20161101
 holiday.it-IT22.name=Immacolata concezione
-holiday.it-IT22.date=20211208
+holiday.it-IT22.date=20161208
 holiday.it-IT23.name=Natale
-holiday.it-IT23.date=20211225
+holiday.it-IT23.date=20161225
 holiday.it-IT24.name=S.to Stefano
-holiday.it-IT24.date=20211226
+holiday.it-IT24.date=20161226
--- a/doc/rc/holidays.jp-JP.rc
+++ b/doc/rc/holidays.jp-JP.rc
@@ -0,0 +1,91 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/jp-JP/2015.json
 # http://holidata.net/jp-JP/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.jp-JP1.name=元日
 holiday.jp-JP1.date=20150101
 holiday.jp-JP2.name=成人の日
 holiday.jp-JP2.date=20150112
 holiday.jp-JP3.name=建国記念の日
 holiday.jp-JP3.date=20150211
 holiday.jp-JP4.name=春分の日
 holiday.jp-JP4.date=20150321
 holiday.jp-JP5.name=昭和の日
 holiday.jp-JP5.date=20150429
 holiday.jp-JP6.name=憲法記念日
 holiday.jp-JP6.date=20150503
 holiday.jp-JP7.name=みどりの日
 holiday.jp-JP7.date=20150504
 holiday.jp-JP8.name=こどもの日
 holiday.jp-JP8.date=20150505
 holiday.jp-JP9.name=振替休日
 holiday.jp-JP9.date=20150506
 holiday.jp-JP10.name=海の日
 holiday.jp-JP10.date=20150720
 holiday.jp-JP11.name=敬老の日
 holiday.jp-JP11.date=20150921
 holiday.jp-JP12.name=秋分の日
 holiday.jp-JP12.date=20150923
 holiday.jp-JP13.name=体育の日
 holiday.jp-JP13.date=20151012
 holiday.jp-JP14.name=文化の日
 holiday.jp-JP14.date=20151103
 holiday.jp-JP15.name=勤労感謝の日
 holiday.jp-JP15.date=20151123
 holiday.jp-JP16.name=天皇誕生日
 holiday.jp-JP16.date=20151223
 holiday.jp-JP17.name=元日
 holiday.jp-JP17.date=20160101
 holiday.jp-JP18.name=成人の日
 holiday.jp-JP18.date=20160111
 holiday.jp-JP19.name=建国記念の日
 holiday.jp-JP19.date=20160211
 holiday.jp-JP20.name=春分の日
 holiday.jp-JP20.date=20160321
 holiday.jp-JP21.name=昭和の日
 holiday.jp-JP21.date=20160429
 holiday.jp-JP22.name=憲法記念日
 holiday.jp-JP22.date=20160503
 holiday.jp-JP23.name=みどりの日
 holiday.jp-JP23.date=20160504
 holiday.jp-JP24.name=こどもの日
 holiday.jp-JP24.date=20160505
 holiday.jp-JP25.name=海の日
 holiday.jp-JP25.date=20160718
 holiday.jp-JP26.name=敬老の日
 holiday.jp-JP26.date=20160919
 holiday.jp-JP27.name=秋分の日
 holiday.jp-JP27.date=20160922
 holiday.jp-JP28.name=体育の日
 holiday.jp-JP28.date=20161010
 holiday.jp-JP29.name=文化の日
 holiday.jp-JP29.date=20161103
 holiday.jp-JP30.name=勤労感謝の日
 holiday.jp-JP30.date=20161123
 holiday.jp-JP31.name=天皇誕生日
 holiday.jp-JP31.date=20161223
--- a/doc/rc/holidays.lt-LT.rc
+++ b/doc/rc/holidays.lt-LT.rc
@@ -0,0 +1,81 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/lt-LT/2015.json
 # http://holidata.net/lt-LT/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.lt-LT1.name=Naujieji metai
 holiday.lt-LT1.date=20150101
 holiday.lt-LT2.name=Lietuvos valstybės atkūrimo diena
 holiday.lt-LT2.date=20150216
 holiday.lt-LT3.name=Lietuvos nepriklausomybės atkūrimo diena
 holiday.lt-LT3.date=20150311
 holiday.lt-LT4.name=Velykos
 holiday.lt-LT4.date=20150405
 holiday.lt-LT5.name=Velykos
 holiday.lt-LT5.date=20150406
 holiday.lt-LT6.name=Tarptautinė darbo diena
 holiday.lt-LT6.date=20150501
 holiday.lt-LT7.name=Joninės, Rasos
 holiday.lt-LT7.date=20150624
 holiday.lt-LT8.name=Valstybės diena
 holiday.lt-LT8.date=20150706
 holiday.lt-LT9.name=Žolinė
 holiday.lt-LT9.date=20150815
 holiday.lt-LT10.name=Visų šventųjų diena
 holiday.lt-LT10.date=20151101
 holiday.lt-LT11.name=Šv. Kalėdos
 holiday.lt-LT11.date=20151224
 holiday.lt-LT12.name=Šv. Kalėdos
 holiday.lt-LT12.date=20151225
 holiday.lt-LT13.name=Šv. Kalėdos
 holiday.lt-LT13.date=20151226
 holiday.lt-LT14.name=Naujieji metai
 holiday.lt-LT14.date=20160101
 holiday.lt-LT15.name=Lietuvos valstybės atkūrimo diena
 holiday.lt-LT15.date=20160216
 holiday.lt-LT16.name=Lietuvos nepriklausomybės atkūrimo diena
 holiday.lt-LT16.date=20160311
 holiday.lt-LT17.name=Velykos
 holiday.lt-LT17.date=20160327
 holiday.lt-LT18.name=Velykos
 holiday.lt-LT18.date=20160328
 holiday.lt-LT19.name=Tarptautinė darbo diena
 holiday.lt-LT19.date=20160501
 holiday.lt-LT20.name=Joninės, Rasos
 holiday.lt-LT20.date=20160624
 holiday.lt-LT21.name=Valstybės diena
 holiday.lt-LT21.date=20160706
 holiday.lt-LT22.name=Žolinė
 holiday.lt-LT22.date=20160815
 holiday.lt-LT23.name=Visų šventųjų diena
 holiday.lt-LT23.date=20161101
 holiday.lt-LT24.name=Šv. Kalėdos
 holiday.lt-LT24.date=20161224
 holiday.lt-LT25.name=Šv. Kalėdos
 holiday.lt-LT25.date=20161225
 holiday.lt-LT26.name=Šv. Kalėdos
 holiday.lt-LT26.date=20161226
--- a/doc/rc/holidays.lv-LV.rc
+++ b/doc/rc/holidays.lv-LV.rc
@@ -0,0 +1,77 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/lv-LV/2015.json
 # http://holidata.net/lv-LV/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.lv-LV1.name=Jaunais Gads
 holiday.lv-LV1.date=20150101
 holiday.lv-LV2.name=Lielā Piektdiena
 holiday.lv-LV2.date=20150403
 holiday.lv-LV3.name=Lieldienas
 holiday.lv-LV3.date=20150405
 holiday.lv-LV4.name=2. Lieldienas
 holiday.lv-LV4.date=20150406
 holiday.lv-LV5.name=Darba svētki
 holiday.lv-LV5.date=20150501
 holiday.lv-LV6.name=Latvijas Republikas Neatkarības atjaunošanas dienu
 holiday.lv-LV6.date=20150505
 holiday.lv-LV7.name=Jāņi
 holiday.lv-LV7.date=20150624
 holiday.lv-LV8.name=Latvijas Republikas proklamēšanas diena
 holiday.lv-LV8.date=20151118
 holiday.lv-LV9.name=Ziemassvētku vakars
 holiday.lv-LV9.date=20151224
 holiday.lv-LV10.name=Ziemassvētki
 holiday.lv-LV10.date=20151225
 holiday.lv-LV11.name=2. Ziemassvētki
 holiday.lv-LV11.date=20151226
 holiday.lv-LV12.name=Vecgada vakars
 holiday.lv-LV12.date=20151231
 holiday.lv-LV13.name=Jaunais Gads
 holiday.lv-LV13.date=20160101
 holiday.lv-LV14.name=Lielā Piektdiena
 holiday.lv-LV14.date=20160325
 holiday.lv-LV15.name=Lieldienas
 holiday.lv-LV15.date=20160327
 holiday.lv-LV16.name=2. Lieldienas
 holiday.lv-LV16.date=20160327
 holiday.lv-LV17.name=Darba svētki
 holiday.lv-LV17.date=20160501
 holiday.lv-LV18.name=Latvijas Republikas Neatkarības atjaunošanas dienu
 holiday.lv-LV18.date=20160505
 holiday.lv-LV19.name=Jāņi
 holiday.lv-LV19.date=20160624
 holiday.lv-LV20.name=Latvijas Republikas proklamēšanas diena
 holiday.lv-LV20.date=20161118
 holiday.lv-LV21.name=Ziemassvētku vakars
 holiday.lv-LV21.date=20161224
 holiday.lv-LV22.name=Ziemassvētki
 holiday.lv-LV22.date=20161225
 holiday.lv-LV23.name=2. Ziemassvētki
 holiday.lv-LV23.date=20161226
 holiday.lv-LV24.name=Vecgada vakars
 holiday.lv-LV24.date=20161231
--- a/doc/rc/holidays.nb-NO.rc
+++ b/doc/rc/holidays.nb-NO.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/nb-NO/2020.json
+# http://holidata.net/nb-NO/2015.json
-# https://holidata.net/nb-NO/2021.json
+# http://holidata.net/nb-NO/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,75 +23,75 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.nb-NO1.name=Nyttårsdag
-holiday.nb-NO1.date=20200101
+holiday.nb-NO1.date=20150101
 holiday.nb-NO2.name=Fastelavn
-holiday.nb-NO2.date=20200223
+holiday.nb-NO2.date=20150215
 holiday.nb-NO3.name=Palmesøndag
-holiday.nb-NO3.date=20200405
+holiday.nb-NO3.date=20150329
 holiday.nb-NO4.name=Skjærtorsdag
-holiday.nb-NO4.date=20200409
+holiday.nb-NO4.date=20150402
 holiday.nb-NO5.name=Langfredag
-holiday.nb-NO5.date=20200410
+holiday.nb-NO5.date=20150403
 holiday.nb-NO6.name=Påskedag
-holiday.nb-NO6.date=20200412
+holiday.nb-NO6.date=20150405
 holiday.nb-NO7.name=Påskedag
-holiday.nb-NO7.date=20200413
+holiday.nb-NO7.date=20150406
 holiday.nb-NO8.name=Offentlig Høytidsdag
-holiday.nb-NO8.date=20200501
+holiday.nb-NO8.date=20150501
 holiday.nb-NO9.name=Frigjøringsdag 1945
-holiday.nb-NO9.date=20200508
+holiday.nb-NO9.date=20150508
 holiday.nb-NO10.name=Grunnlovsdag
-holiday.nb-NO10.date=20200517
+holiday.nb-NO10.date=20150517
 holiday.nb-NO11.name=Kristi Himmelfartsdag
-holiday.nb-NO11.date=20200521
+holiday.nb-NO11.date=20150514
 holiday.nb-NO12.name=Pinsedag
-holiday.nb-NO12.date=20200531
+holiday.nb-NO12.date=20150524
 holiday.nb-NO13.name=Pinsedag
-holiday.nb-NO13.date=20200601
+holiday.nb-NO13.date=20150525
 holiday.nb-NO14.name=Julaften
-holiday.nb-NO14.date=20201224
+holiday.nb-NO14.date=20151224
 holiday.nb-NO15.name=Juledag
-holiday.nb-NO15.date=20201225
+holiday.nb-NO15.date=20151225
 holiday.nb-NO16.name=Juledag
-holiday.nb-NO16.date=20201226
+holiday.nb-NO16.date=20151226
 holiday.nb-NO17.name=Nyttårsaften
-holiday.nb-NO17.date=20201231
+holiday.nb-NO17.date=20151231
 holiday.nb-NO18.name=Nyttårsdag
-holiday.nb-NO18.date=20210101
+holiday.nb-NO18.date=20160101
 holiday.nb-NO19.name=Fastelavn
-holiday.nb-NO19.date=20210214
+holiday.nb-NO19.date=20160207
 holiday.nb-NO20.name=Palmesøndag
-holiday.nb-NO20.date=20210328
+holiday.nb-NO20.date=20160320
 holiday.nb-NO21.name=Skjærtorsdag
-holiday.nb-NO21.date=20210401
+holiday.nb-NO21.date=20160324
 holiday.nb-NO22.name=Langfredag
-holiday.nb-NO22.date=20210402
+holiday.nb-NO22.date=20160325
 holiday.nb-NO23.name=Påskedag
-holiday.nb-NO23.date=20210404
+holiday.nb-NO23.date=20160327
 holiday.nb-NO24.name=Påskedag
-holiday.nb-NO24.date=20210405
+holiday.nb-NO24.date=20160328
 holiday.nb-NO25.name=Offentlig Høytidsdag
-holiday.nb-NO25.date=20210501
+holiday.nb-NO25.date=20160501
 holiday.nb-NO26.name=Frigjøringsdag 1945
-holiday.nb-NO26.date=20210508
+holiday.nb-NO26.date=20160508
-holiday.nb-NO27.name=Kristi Himmelfartsdag
+holiday.nb-NO27.name=Grunnlovsdag
-holiday.nb-NO27.date=20210513
+holiday.nb-NO27.date=20160517
-holiday.nb-NO28.name=Grunnlovsdag
+holiday.nb-NO28.name=Kristi Himmelfartsdag
-holiday.nb-NO28.date=20210517
+holiday.nb-NO28.date=20160505
 holiday.nb-NO29.name=Pinsedag
-holiday.nb-NO29.date=20210523
+holiday.nb-NO29.date=20160515
 holiday.nb-NO30.name=Pinsedag
-holiday.nb-NO30.date=20210524
+holiday.nb-NO30.date=20160516
 holiday.nb-NO31.name=Julaften
-holiday.nb-NO31.date=20211224
+holiday.nb-NO31.date=20161224
 holiday.nb-NO32.name=Juledag
-holiday.nb-NO32.date=20211225
+holiday.nb-NO32.date=20161225
 holiday.nb-NO33.name=Juledag
-holiday.nb-NO33.date=20211226
+holiday.nb-NO33.date=20161226
 holiday.nb-NO34.name=Nyttårsaften
-holiday.nb-NO34.date=20211231
+holiday.nb-NO34.date=20161231
--- a/doc/rc/holidays.nb-SJ.rc
+++ b/doc/rc/holidays.nb-SJ.rc
@@ -0,0 +1,97 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/nb-SJ/2015.json
 # http://holidata.net/nb-SJ/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.nb-SJ1.name=Nyttårsdag
 holiday.nb-SJ1.date=20150101
 holiday.nb-SJ2.name=Fastelavn
 holiday.nb-SJ2.date=20150215
 holiday.nb-SJ3.name=Palmesøndag
 holiday.nb-SJ3.date=20150329
 holiday.nb-SJ4.name=Skjærtorsdag
 holiday.nb-SJ4.date=20150402
 holiday.nb-SJ5.name=Langfredag
 holiday.nb-SJ5.date=20150403
 holiday.nb-SJ6.name=Påskedag
 holiday.nb-SJ6.date=20150405
 holiday.nb-SJ7.name=Påskedag
 holiday.nb-SJ7.date=20150406
 holiday.nb-SJ8.name=Offentlig Høytidsdag
 holiday.nb-SJ8.date=20150501
 holiday.nb-SJ9.name=Frigjøringsdag 1945
 holiday.nb-SJ9.date=20150508
 holiday.nb-SJ10.name=Grunnlovsdag
 holiday.nb-SJ10.date=20150517
 holiday.nb-SJ11.name=Kristi Himmelfartsdag
 holiday.nb-SJ11.date=20150514
 holiday.nb-SJ12.name=Pinsedag
 holiday.nb-SJ12.date=20150524
 holiday.nb-SJ13.name=Pinsedag
 holiday.nb-SJ13.date=20150525
 holiday.nb-SJ14.name=Julaften
 holiday.nb-SJ14.date=20151224
 holiday.nb-SJ15.name=Juledag
 holiday.nb-SJ15.date=20151225
 holiday.nb-SJ16.name=Juledag
 holiday.nb-SJ16.date=20151226
 holiday.nb-SJ17.name=Nyttårsaften
 holiday.nb-SJ17.date=20151231
 holiday.nb-SJ18.name=Nyttårsdag
 holiday.nb-SJ18.date=20160101
 holiday.nb-SJ19.name=Fastelavn
 holiday.nb-SJ19.date=20160207
 holiday.nb-SJ20.name=Palmesøndag
 holiday.nb-SJ20.date=20160320
 holiday.nb-SJ21.name=Skjærtorsdag
 holiday.nb-SJ21.date=20160324
 holiday.nb-SJ22.name=Langfredag
 holiday.nb-SJ22.date=20160325
 holiday.nb-SJ23.name=Påskedag
 holiday.nb-SJ23.date=20160327
 holiday.nb-SJ24.name=Påskedag
 holiday.nb-SJ24.date=20160328
 holiday.nb-SJ25.name=Offentlig Høytidsdag
 holiday.nb-SJ25.date=20160501
 holiday.nb-SJ26.name=Frigjøringsdag 1945
 holiday.nb-SJ26.date=20160508
 holiday.nb-SJ27.name=Grunnlovsdag
 holiday.nb-SJ27.date=20160517
 holiday.nb-SJ28.name=Kristi Himmelfartsdag
 holiday.nb-SJ28.date=20160505
 holiday.nb-SJ29.name=Pinsedag
 holiday.nb-SJ29.date=20160515
 holiday.nb-SJ30.name=Pinsedag
 holiday.nb-SJ30.date=20160516
 holiday.nb-SJ31.name=Julaften
 holiday.nb-SJ31.date=20161224
 holiday.nb-SJ32.name=Juledag
 holiday.nb-SJ32.date=20161225
 holiday.nb-SJ33.name=Juledag
 holiday.nb-SJ33.date=20161226
 holiday.nb-SJ34.name=Nyttårsaften
 holiday.nb-SJ34.date=20161231
--- a/doc/rc/holidays.nl-BE.rc
+++ b/doc/rc/holidays.nl-BE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/nl-BE/2020.json
+# http://holidata.net/nl-BE/2015.json
-# https://holidata.net/nl-BE/2021.json
+# http://holidata.net/nl-BE/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,55 +23,55 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.nl-BE1.name=Nieuwjaar
-holiday.nl-BE1.date=20200101
+holiday.nl-BE1.date=20150101
 holiday.nl-BE2.name=Pasen
-holiday.nl-BE2.date=20200412
+holiday.nl-BE2.date=20150405
 holiday.nl-BE3.name=Paasmaandag
-holiday.nl-BE3.date=20200413
+holiday.nl-BE3.date=20150406
 holiday.nl-BE4.name=Dag van de arbeid
-holiday.nl-BE4.date=20200501
+holiday.nl-BE4.date=20150501
 holiday.nl-BE5.name=Onze Lieve Heer hemelvaart
-holiday.nl-BE5.date=20200521
+holiday.nl-BE5.date=20150514
 holiday.nl-BE6.name=Pinksteren
-holiday.nl-BE6.date=20200531
+holiday.nl-BE6.date=20150524
 holiday.nl-BE7.name=Pinkstermaandag
-holiday.nl-BE7.date=20200601
+holiday.nl-BE7.date=20150525
 holiday.nl-BE8.name=Nationale feestdag
-holiday.nl-BE8.date=20200721
+holiday.nl-BE8.date=20150721
 holiday.nl-BE9.name=Onze Lieve Vrouw hemelvaart
-holiday.nl-BE9.date=20200815
+holiday.nl-BE9.date=20150815
 holiday.nl-BE10.name=Allerheiligen
-holiday.nl-BE10.date=20201101
+holiday.nl-BE10.date=20151101
 holiday.nl-BE11.name=Wapenstilstand
-holiday.nl-BE11.date=20201111
+holiday.nl-BE11.date=20151111
 holiday.nl-BE12.name=Kerstmis
-holiday.nl-BE12.date=20201225
+holiday.nl-BE12.date=20151225
 holiday.nl-BE13.name=Nieuwjaar
-holiday.nl-BE13.date=20210101
+holiday.nl-BE13.date=20160101
 holiday.nl-BE14.name=Pasen
-holiday.nl-BE14.date=20210404
+holiday.nl-BE14.date=20160327
 holiday.nl-BE15.name=Paasmaandag
-holiday.nl-BE15.date=20210405
+holiday.nl-BE15.date=20160328
 holiday.nl-BE16.name=Dag van de arbeid
-holiday.nl-BE16.date=20210501
+holiday.nl-BE16.date=20160501
 holiday.nl-BE17.name=Onze Lieve Heer hemelvaart
-holiday.nl-BE17.date=20210513
+holiday.nl-BE17.date=20160505
 holiday.nl-BE18.name=Pinksteren
-holiday.nl-BE18.date=20210523
+holiday.nl-BE18.date=20160515
 holiday.nl-BE19.name=Pinkstermaandag
-holiday.nl-BE19.date=20210524
+holiday.nl-BE19.date=20160516
 holiday.nl-BE20.name=Nationale feestdag
-holiday.nl-BE20.date=20210721
+holiday.nl-BE20.date=20160721
 holiday.nl-BE21.name=Onze Lieve Vrouw hemelvaart
-holiday.nl-BE21.date=20210815
+holiday.nl-BE21.date=20160815
 holiday.nl-BE22.name=Allerheiligen
-holiday.nl-BE22.date=20211101
+holiday.nl-BE22.date=20161101
 holiday.nl-BE23.name=Wapenstilstand
-holiday.nl-BE23.date=20211111
+holiday.nl-BE23.date=20161111
 holiday.nl-BE24.name=Kerstmis
-holiday.nl-BE24.date=20211225
+holiday.nl-BE24.date=20161225
--- a/doc/rc/holidays.nl-NL.rc
+++ b/doc/rc/holidays.nl-NL.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/nl-NL/2020.json
+# http://holidata.net/nl-NL/2015.json
-# https://holidata.net/nl-NL/2021.json
+# http://holidata.net/nl-NL/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,63 +23,59 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
-holiday.nl-NL1.name=Nieuwjaarsdag
+holiday.nl-NL1.name=Nieuwjaar
-holiday.nl-NL1.date=20200101
+holiday.nl-NL1.date=20150101
 holiday.nl-NL2.name=Goede Vrijdag
-holiday.nl-NL2.date=20200410
+holiday.nl-NL2.date=20150403
-holiday.nl-NL3.name=Eerste Paasdag
+holiday.nl-NL3.name=Pasen
-holiday.nl-NL3.date=20200412
+holiday.nl-NL3.date=20150405
-holiday.nl-NL4.name=Tweede Paasdag
+holiday.nl-NL4.name=Tweede Pasdag
-holiday.nl-NL4.date=20200413
+holiday.nl-NL4.date=20150406
-holiday.nl-NL5.name=Koningsdag
+holiday.nl-NL5.name=Koninginnedag
-holiday.nl-NL5.date=20200427
+holiday.nl-NL5.date=20150427
 holiday.nl-NL6.name=Dodenherdenking
-holiday.nl-NL6.date=20200504
+holiday.nl-NL6.date=20150504
 holiday.nl-NL7.name=Bevrijdingsdag
-holiday.nl-NL7.date=20200505
+holiday.nl-NL7.date=20150505
 holiday.nl-NL8.name=Hemelvaartsdag
-holiday.nl-NL8.date=20200521
+holiday.nl-NL8.date=20150514
-holiday.nl-NL9.name=Eerste Pinksterdag
+holiday.nl-NL9.name=Pinksteren
-holiday.nl-NL9.date=20200531
+holiday.nl-NL9.date=20150524
 holiday.nl-NL10.name=Tweede Pinksterdag
-holiday.nl-NL10.date=20200601
+holiday.nl-NL10.date=20150525
 holiday.nl-NL11.name=Sinterklaas
-holiday.nl-NL11.date=20201205
+holiday.nl-NL11.date=20151205
-holiday.nl-NL12.name=Koninkrijksdag
+holiday.nl-NL12.name=Kerstmis
-holiday.nl-NL12.date=20201215
+holiday.nl-NL12.date=20151225
-holiday.nl-NL13.name=Eerste Kerstdag
+holiday.nl-NL13.name=Tweede Kerstdag
-holiday.nl-NL13.date=20201225
+holiday.nl-NL13.date=20151226
-holiday.nl-NL14.name=Tweede Kerstdag
+holiday.nl-NL14.name=Nieuwjaar
-holiday.nl-NL14.date=20201226
+holiday.nl-NL14.date=20160101
-holiday.nl-NL15.name=Nieuwjaarsdag
+holiday.nl-NL15.name=Goede Vrijdag
-holiday.nl-NL15.date=20210101
+holiday.nl-NL15.date=20160325
-holiday.nl-NL16.name=Goede Vrijdag
+holiday.nl-NL16.name=Pasen
-holiday.nl-NL16.date=20210402
+holiday.nl-NL16.date=20160327
-holiday.nl-NL17.name=Eerste Paasdag
+holiday.nl-NL17.name=Tweede Pasdag
-holiday.nl-NL17.date=20210404
+holiday.nl-NL17.date=20160328
-holiday.nl-NL18.name=Tweede Paasdag
+holiday.nl-NL18.name=Koninginnedag
-holiday.nl-NL18.date=20210405
+holiday.nl-NL18.date=20160427
-holiday.nl-NL19.name=Koningsdag
+holiday.nl-NL19.name=Dodenherdenking
-holiday.nl-NL19.date=20210427
+holiday.nl-NL19.date=20160504
-holiday.nl-NL20.name=Dodenherdenking
+holiday.nl-NL20.name=Bevrijdingsdag
-holiday.nl-NL20.date=20210504
+holiday.nl-NL20.date=20160505
-holiday.nl-NL21.name=Bevrijdingsdag
+holiday.nl-NL21.name=Hemelvaartsdag
-holiday.nl-NL21.date=20210505
+holiday.nl-NL21.date=20160505
-holiday.nl-NL22.name=Hemelvaartsdag
+holiday.nl-NL22.name=Pinksteren
-holiday.nl-NL22.date=20210513
+holiday.nl-NL22.date=20160515
-holiday.nl-NL23.name=Eerste Pinksterdag
+holiday.nl-NL23.name=Tweede Pinksterdag
-holiday.nl-NL23.date=20210523
+holiday.nl-NL23.date=20160516
-holiday.nl-NL24.name=Tweede Pinksterdag
+holiday.nl-NL24.name=Sinterklaas
-holiday.nl-NL24.date=20210524
+holiday.nl-NL24.date=20161205
-holiday.nl-NL25.name=Sinterklaas
+holiday.nl-NL25.name=Kerstmis
-holiday.nl-NL25.date=20211205
+holiday.nl-NL25.date=20161225
-holiday.nl-NL26.name=Koninkrijksdag
+holiday.nl-NL26.name=Tweede Kerstdag
-holiday.nl-NL26.date=20211215
+holiday.nl-NL26.date=20161226
 holiday.nl-NL27.name=Eerste Kerstdag
 holiday.nl-NL27.date=20211225
 holiday.nl-NL28.name=Tweede Kerstdag
 holiday.nl-NL28.date=20211226
--- a/doc/rc/holidays.pl-PL.rc
+++ b/doc/rc/holidays.pl-PL.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/pl-PL/2020.json
+# http://holidata.net/pl-PL/2015.json
-# https://holidata.net/pl-PL/2021.json
+# http://holidata.net/pl-PL/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,59 +23,63 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.pl-PL1.name=Nowy Rok
-holiday.pl-PL1.date=20200101
+holiday.pl-PL1.date=20150101
 holiday.pl-PL2.name=Trzech Króli
-holiday.pl-PL2.date=20200106
+holiday.pl-PL2.date=20150106
 holiday.pl-PL3.name=Wielkanoc
-holiday.pl-PL3.date=20200412
+holiday.pl-PL3.date=20150405
 holiday.pl-PL4.name=Poniedziałek Wielkanocny
-holiday.pl-PL4.date=20200413
+holiday.pl-PL4.date=20150406
 holiday.pl-PL5.name=Święto Pracy
-holiday.pl-PL5.date=20200501
+holiday.pl-PL5.date=20150501
 holiday.pl-PL6.name=Święto Konstytucji Trzeciego Maja
-holiday.pl-PL6.date=20200503
+holiday.pl-PL6.date=20150503
 holiday.pl-PL7.name=Zielone Świątki
-holiday.pl-PL7.date=20200531
+holiday.pl-PL7.date=20150524
 holiday.pl-PL8.name=Boże Ciało
-holiday.pl-PL8.date=20200611
+holiday.pl-PL8.date=20150604
-holiday.pl-PL9.name=Wniebowzięcie Najświętszej Maryi Panny
+holiday.pl-PL9.name=Święto Wojska Polskiego
-holiday.pl-PL9.date=20200815
+holiday.pl-PL9.date=20150815
-holiday.pl-PL10.name=Wszystkich Świętych
+holiday.pl-PL10.name=Wniebowzięcia NMP
-holiday.pl-PL10.date=20201101
+holiday.pl-PL10.date=20150815
-holiday.pl-PL11.name=Narodowe Święto Niepodległości
+holiday.pl-PL11.name=Wszystkich Świętych
-holiday.pl-PL11.date=20201111
+holiday.pl-PL11.date=20151101
-holiday.pl-PL12.name=Boże Narodzenie (pierwszy dzień)
+holiday.pl-PL12.name=Dzień Niepodległości
-holiday.pl-PL12.date=20201225
+holiday.pl-PL12.date=20151111
-holiday.pl-PL13.name=Boże Narodzenie (drugi dzień)
+holiday.pl-PL13.name=Boże Narodzenie (pierwszy dzień)
-holiday.pl-PL13.date=20201226
+holiday.pl-PL13.date=20151225
-holiday.pl-PL14.name=Nowy Rok
+holiday.pl-PL14.name=Boże Narodzenie (drugi dzień)
-holiday.pl-PL14.date=20210101
+holiday.pl-PL14.date=20151226
-holiday.pl-PL15.name=Trzech Króli
+holiday.pl-PL15.name=Nowy Rok
-holiday.pl-PL15.date=20210106
+holiday.pl-PL15.date=20160101
-holiday.pl-PL16.name=Wielkanoc
+holiday.pl-PL16.name=Trzech Króli
-holiday.pl-PL16.date=20210404
+holiday.pl-PL16.date=20160106
-holiday.pl-PL17.name=Poniedziałek Wielkanocny
+holiday.pl-PL17.name=Wielkanoc
-holiday.pl-PL17.date=20210405
+holiday.pl-PL17.date=20160327
-holiday.pl-PL18.name=Święto Pracy
+holiday.pl-PL18.name=Poniedziałek Wielkanocny
-holiday.pl-PL18.date=20210501
+holiday.pl-PL18.date=20160328
-holiday.pl-PL19.name=Święto Konstytucji Trzeciego Maja
+holiday.pl-PL19.name=Święto Pracy
-holiday.pl-PL19.date=20210503
+holiday.pl-PL19.date=20160501
-holiday.pl-PL20.name=Zielone Świątki
+holiday.pl-PL20.name=Święto Konstytucji Trzeciego Maja
-holiday.pl-PL20.date=20210523
+holiday.pl-PL20.date=20160503
-holiday.pl-PL21.name=Boże Ciało
+holiday.pl-PL21.name=Zielone Świątki
-holiday.pl-PL21.date=20210603
+holiday.pl-PL21.date=20160515
-holiday.pl-PL22.name=Wniebowzięcie Najświętszej Maryi Panny
+holiday.pl-PL22.name=Boże Ciało
-holiday.pl-PL22.date=20210815
+holiday.pl-PL22.date=20160526
-holiday.pl-PL23.name=Wszystkich Świętych
+holiday.pl-PL23.name=Święto Wojska Polskiego
-holiday.pl-PL23.date=20211101
+holiday.pl-PL23.date=20160815
-holiday.pl-PL24.name=Narodowe Święto Niepodległości
+holiday.pl-PL24.name=Wniebowzięcia NMP
-holiday.pl-PL24.date=20211111
+holiday.pl-PL24.date=20160815
-holiday.pl-PL25.name=Boże Narodzenie (pierwszy dzień)
+holiday.pl-PL25.name=Wszystkich Świętych
-holiday.pl-PL25.date=20211225
+holiday.pl-PL25.date=20161101
-holiday.pl-PL26.name=Boże Narodzenie (drugi dzień)
+holiday.pl-PL26.name=Dzień Niepodległości
-holiday.pl-PL26.date=20211226
+holiday.pl-PL26.date=20161111
 holiday.pl-PL27.name=Boże Narodzenie (pierwszy dzień)
 holiday.pl-PL27.date=20161225
 holiday.pl-PL28.name=Boże Narodzenie (drugi dzień)
 holiday.pl-PL28.date=20161226
--- a/doc/rc/holidays.pt-BR.rc
+++ b/doc/rc/holidays.pt-BR.rc
@@ -0,0 +1,81 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # http://holidata.net/pt-BR/2015.json
 # http://holidata.net/pt-BR/2016.json
 #
 # Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.pt-BR1.name=Confraternização Universal
 holiday.pt-BR1.date=20150101
 holiday.pt-BR2.name=Carnaval
 holiday.pt-BR2.date=20150216
 holiday.pt-BR3.name=Carnaval
 holiday.pt-BR3.date=20150217
 holiday.pt-BR4.name=Sexta-feira Santa
 holiday.pt-BR4.date=20150403
 holiday.pt-BR5.name=Páscoa
 holiday.pt-BR5.date=20150405
 holiday.pt-BR6.name=Tiradentes
 holiday.pt-BR6.date=20150421
 holiday.pt-BR7.name=Dia do Trabalho
 holiday.pt-BR7.date=20150501
 holiday.pt-BR8.name=Corpus Christi
 holiday.pt-BR8.date=20150604
 holiday.pt-BR9.name=Independência do Brasil
 holiday.pt-BR9.date=20150907
 holiday.pt-BR10.name=Nossa Senhora Aparecida
 holiday.pt-BR10.date=20151012
 holiday.pt-BR11.name=Finados
 holiday.pt-BR11.date=20151102
 holiday.pt-BR12.name=Proclamação da República
 holiday.pt-BR12.date=20151115
 holiday.pt-BR13.name=Natal
 holiday.pt-BR13.date=20151225
 holiday.pt-BR14.name=Confraternização Universal
 holiday.pt-BR14.date=20160101
 holiday.pt-BR15.name=Carnaval
 holiday.pt-BR15.date=20160208
 holiday.pt-BR16.name=Carnaval
 holiday.pt-BR16.date=20160209
 holiday.pt-BR17.name=Sexta-feira Santa
 holiday.pt-BR17.date=20160325
 holiday.pt-BR18.name=Páscoa
 holiday.pt-BR18.date=20160327
 holiday.pt-BR19.name=Tiradentes
 holiday.pt-BR19.date=20160421
 holiday.pt-BR20.name=Dia do Trabalho
 holiday.pt-BR20.date=20160501
 holiday.pt-BR21.name=Corpus Christi
 holiday.pt-BR21.date=20160526
 holiday.pt-BR22.name=Independência do Brasil
 holiday.pt-BR22.date=20160907
 holiday.pt-BR23.name=Nossa Senhora Aparecida
 holiday.pt-BR23.date=20161012
 holiday.pt-BR24.name=Finados
 holiday.pt-BR24.date=20161102
 holiday.pt-BR25.name=Proclamação da República
 holiday.pt-BR25.date=20161115
 holiday.pt-BR26.name=Natal
 holiday.pt-BR26.date=20161225
--- a/doc/rc/holidays.pt-PT.rc
+++ b/doc/rc/holidays.pt-PT.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/pt-PT/2020.json
+# http://holidata.net/pt-PT/2015.json
-# https://holidata.net/pt-PT/2021.json
+# http://holidata.net/pt-PT/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,63 +23,63 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.pt-PT1.name=Ano Novo
-holiday.pt-PT1.date=20200101
+holiday.pt-PT1.date=20150101
 holiday.pt-PT2.name=Carnaval
-holiday.pt-PT2.date=20200225
+holiday.pt-PT2.date=20150217
 holiday.pt-PT3.name=Sexta-feira Santa
-holiday.pt-PT3.date=20200410
+holiday.pt-PT3.date=20150403
 holiday.pt-PT4.name=Páscoa
-holiday.pt-PT4.date=20200412
+holiday.pt-PT4.date=20150405
 holiday.pt-PT5.name=Dia da Liberdade
-holiday.pt-PT5.date=20200425
+holiday.pt-PT5.date=20150425
 holiday.pt-PT6.name=Dia do Trabalhador
-holiday.pt-PT6.date=20200501
+holiday.pt-PT6.date=20150501
-holiday.pt-PT7.name=Dia de Portugal
+holiday.pt-PT7.name=Corpo de Deus
-holiday.pt-PT7.date=20200610
+holiday.pt-PT7.date=20150604
-holiday.pt-PT8.name=Corpo de Deus
+holiday.pt-PT8.name=Dia de Portugal
-holiday.pt-PT8.date=20200611
+holiday.pt-PT8.date=20150610
 holiday.pt-PT9.name=Assunção de Nossa Senhora
-holiday.pt-PT9.date=20200815
+holiday.pt-PT9.date=20150815
 holiday.pt-PT10.name=Implantação da República
-holiday.pt-PT10.date=20201005
+holiday.pt-PT10.date=20151005
-holiday.pt-PT11.name=Dia de Todos os Santos
+holiday.pt-PT11.name=Todos os Santos
-holiday.pt-PT11.date=20201101
+holiday.pt-PT11.date=20151101
 holiday.pt-PT12.name=Restauração da Independência
-holiday.pt-PT12.date=20201201
+holiday.pt-PT12.date=20151201
 holiday.pt-PT13.name=Imaculada Conceição
-holiday.pt-PT13.date=20201208
+holiday.pt-PT13.date=20151208
 holiday.pt-PT14.name=Natal
-holiday.pt-PT14.date=20201225
+holiday.pt-PT14.date=20151225
 holiday.pt-PT15.name=Ano Novo
-holiday.pt-PT15.date=20210101
+holiday.pt-PT15.date=20160101
 holiday.pt-PT16.name=Carnaval
-holiday.pt-PT16.date=20210216
+holiday.pt-PT16.date=20160209
 holiday.pt-PT17.name=Sexta-feira Santa
-holiday.pt-PT17.date=20210402
+holiday.pt-PT17.date=20160325
 holiday.pt-PT18.name=Páscoa
-holiday.pt-PT18.date=20210404
+holiday.pt-PT18.date=20160327
 holiday.pt-PT19.name=Dia da Liberdade
-holiday.pt-PT19.date=20210425
+holiday.pt-PT19.date=20160425
 holiday.pt-PT20.name=Dia do Trabalhador
-holiday.pt-PT20.date=20210501
+holiday.pt-PT20.date=20160501
 holiday.pt-PT21.name=Corpo de Deus
-holiday.pt-PT21.date=20210603
+holiday.pt-PT21.date=20160526
 holiday.pt-PT22.name=Dia de Portugal
-holiday.pt-PT22.date=20210610
+holiday.pt-PT22.date=20160610
 holiday.pt-PT23.name=Assunção de Nossa Senhora
-holiday.pt-PT23.date=20210815
+holiday.pt-PT23.date=20160815
 holiday.pt-PT24.name=Implantação da República
-holiday.pt-PT24.date=20211005
+holiday.pt-PT24.date=20161005
-holiday.pt-PT25.name=Dia de Todos os Santos
+holiday.pt-PT25.name=Todos os Santos
-holiday.pt-PT25.date=20211101
+holiday.pt-PT25.date=20161101
 holiday.pt-PT26.name=Restauração da Independência
-holiday.pt-PT26.date=20211201
+holiday.pt-PT26.date=20161201
 holiday.pt-PT27.name=Imaculada Conceição
-holiday.pt-PT27.date=20211208
+holiday.pt-PT27.date=20161208
 holiday.pt-PT28.name=Natal
-holiday.pt-PT28.date=20211225
+holiday.pt-PT28.date=20161225
--- a/doc/rc/holidays.ru-RU.rc
+++ b/doc/rc/holidays.ru-RU.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/ru-RU/2020.json
+# http://holidata.net/ru-RU/2015.json
-# https://holidata.net/ru-RU/2021.json
+# http://holidata.net/ru-RU/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,43 +23,43 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.ru-RU1.name=Новый Год
-holiday.ru-RU1.date=20200101
+holiday.ru-RU1.date=20150101
 holiday.ru-RU2.name=Рождество Христово
-holiday.ru-RU2.date=20200107
+holiday.ru-RU2.date=20150107
 holiday.ru-RU3.name=День защитника Отечества
-holiday.ru-RU3.date=20200223
+holiday.ru-RU3.date=20150223
 holiday.ru-RU4.name=Международный женский день
-holiday.ru-RU4.date=20200308
+holiday.ru-RU4.date=20150308
 holiday.ru-RU5.name=Пасха
-holiday.ru-RU5.date=20200419
+holiday.ru-RU5.date=20150412
 holiday.ru-RU6.name=Праздник весны и труда
-holiday.ru-RU6.date=20200501
+holiday.ru-RU6.date=20150501
 holiday.ru-RU7.name=День Победы
-holiday.ru-RU7.date=20200509
+holiday.ru-RU7.date=20150509
 holiday.ru-RU8.name=День России
-holiday.ru-RU8.date=20200612
+holiday.ru-RU8.date=20150612
 holiday.ru-RU9.name=День народного единства
-holiday.ru-RU9.date=20201104
+holiday.ru-RU9.date=20151104
 holiday.ru-RU10.name=Новый Год
-holiday.ru-RU10.date=20210101
+holiday.ru-RU10.date=20160101
 holiday.ru-RU11.name=Рождество Христово
-holiday.ru-RU11.date=20210107
+holiday.ru-RU11.date=20160107
 holiday.ru-RU12.name=День защитника Отечества
-holiday.ru-RU12.date=20210223
+holiday.ru-RU12.date=20160223
 holiday.ru-RU13.name=Международный женский день
-holiday.ru-RU13.date=20210308
+holiday.ru-RU13.date=20160308
-holiday.ru-RU14.name=Праздник весны и труда
+holiday.ru-RU14.name=Пасха
-holiday.ru-RU14.date=20210501
+holiday.ru-RU14.date=20160501
-holiday.ru-RU15.name=Пасха
+holiday.ru-RU15.name=Праздник весны и труда
-holiday.ru-RU15.date=20210502
+holiday.ru-RU15.date=20160501
 holiday.ru-RU16.name=День Победы
-holiday.ru-RU16.date=20210509
+holiday.ru-RU16.date=20160509
 holiday.ru-RU17.name=День России
-holiday.ru-RU17.date=20210612
+holiday.ru-RU17.date=20160612
 holiday.ru-RU18.name=День народного единства
-holiday.ru-RU18.date=20211104
+holiday.ru-RU18.date=20161104
--- a/doc/rc/holidays.sv-SE.rc
+++ b/doc/rc/holidays.sv-SE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/sv-SE/2020.json
+# http://holidata.net/sv-SE/2015.json
-# https://holidata.net/sv-SE/2021.json
+# http://holidata.net/sv-SE/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,71 +23,75 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.sv-SE1.name=Nyårsdagen
-holiday.sv-SE1.date=20200101
+holiday.sv-SE1.date=20150101
 holiday.sv-SE2.name=Trettondedag jul
-holiday.sv-SE2.date=20200106
+holiday.sv-SE2.date=20150106
 holiday.sv-SE3.name=Långfredagen
-holiday.sv-SE3.date=20200410
+holiday.sv-SE3.date=20150403
 holiday.sv-SE4.name=Påskdagen
-holiday.sv-SE4.date=20200412
+holiday.sv-SE4.date=20150405
 holiday.sv-SE5.name=Annandag påsk
-holiday.sv-SE5.date=20200413
+holiday.sv-SE5.date=20150406
-holiday.sv-SE6.name=Första maj
+holiday.sv-SE6.name=Valborgmässoafton
-holiday.sv-SE6.date=20200501
+holiday.sv-SE6.date=20150430
-holiday.sv-SE7.name=Kristi himmelsfärdsdag
+holiday.sv-SE7.name=Första maj
-holiday.sv-SE7.date=20200521
+holiday.sv-SE7.date=20150501
-holiday.sv-SE8.name=Pingstdagen
+holiday.sv-SE8.name=Kristi Himmelsfärdsdag
-holiday.sv-SE8.date=20200531
+holiday.sv-SE8.date=20150514
-holiday.sv-SE9.name=Nationaldagen
+holiday.sv-SE9.name=Pingstdagen
-holiday.sv-SE9.date=20200606
+holiday.sv-SE9.date=20150524
-holiday.sv-SE10.name=Midsommarafton
+holiday.sv-SE10.name=Nationaldagen
-holiday.sv-SE10.date=20200619
+holiday.sv-SE10.date=20150606
-holiday.sv-SE11.name=Midsommardagen
+holiday.sv-SE11.name=Midsommarafton
-holiday.sv-SE11.date=20200620
+holiday.sv-SE11.date=20150619
-holiday.sv-SE12.name=Alla helgons dag
+holiday.sv-SE12.name=Midsommardagen
-holiday.sv-SE12.date=20201031
+holiday.sv-SE12.date=20150620
-holiday.sv-SE13.name=Julafton
+holiday.sv-SE13.name=Alla Helgons Dag
-holiday.sv-SE13.date=20201224
+holiday.sv-SE13.date=20151031
-holiday.sv-SE14.name=Juldagen
+holiday.sv-SE14.name=Julafton
-holiday.sv-SE14.date=20201225
+holiday.sv-SE14.date=20151224
-holiday.sv-SE15.name=Annandag jul
+holiday.sv-SE15.name=Juldagen
-holiday.sv-SE15.date=20201226
+holiday.sv-SE15.date=20151225
-holiday.sv-SE16.name=Nyårsafton
+holiday.sv-SE16.name=Annandag jul
-holiday.sv-SE16.date=20201231
+holiday.sv-SE16.date=20151226
-holiday.sv-SE17.name=Nyårsdagen
+holiday.sv-SE17.name=Nyårsafton
-holiday.sv-SE17.date=20210101
+holiday.sv-SE17.date=20151231
-holiday.sv-SE18.name=Trettondedag jul
+holiday.sv-SE18.name=Nyårsdagen
-holiday.sv-SE18.date=20210106
+holiday.sv-SE18.date=20160101
-holiday.sv-SE19.name=Långfredagen
+holiday.sv-SE19.name=Trettondedag jul
-holiday.sv-SE19.date=20210402
+holiday.sv-SE19.date=20160106
-holiday.sv-SE20.name=Påskdagen
+holiday.sv-SE20.name=Långfredagen
-holiday.sv-SE20.date=20210404
+holiday.sv-SE20.date=20160325
-holiday.sv-SE21.name=Annandag påsk
+holiday.sv-SE21.name=Påskdagen
-holiday.sv-SE21.date=20210405
+holiday.sv-SE21.date=20160327
-holiday.sv-SE22.name=Första maj
+holiday.sv-SE22.name=Annandag påsk
-holiday.sv-SE22.date=20210501
+holiday.sv-SE22.date=20160328
-holiday.sv-SE23.name=Kristi himmelsfärdsdag
+holiday.sv-SE23.name=Valborgmässoafton
-holiday.sv-SE23.date=20210513
+holiday.sv-SE23.date=20160430
-holiday.sv-SE24.name=Pingstdagen
+holiday.sv-SE24.name=Första maj
-holiday.sv-SE24.date=20210523
+holiday.sv-SE24.date=20160501
-holiday.sv-SE25.name=Nationaldagen
+holiday.sv-SE25.name=Kristi Himmelsfärdsdag
-holiday.sv-SE25.date=20210606
+holiday.sv-SE25.date=20160505
-holiday.sv-SE26.name=Midsommarafton
+holiday.sv-SE26.name=Pingstdagen
-holiday.sv-SE26.date=20210625
+holiday.sv-SE26.date=20160515
-holiday.sv-SE27.name=Midsommardagen
+holiday.sv-SE27.name=Nationaldagen
-holiday.sv-SE27.date=20210626
+holiday.sv-SE27.date=20160606
-holiday.sv-SE28.name=Alla helgons dag
+holiday.sv-SE28.name=Midsommarafton
-holiday.sv-SE28.date=20211106
+holiday.sv-SE28.date=20160624
-holiday.sv-SE29.name=Julafton
+holiday.sv-SE29.name=Midsommardagen
-holiday.sv-SE29.date=20211224
+holiday.sv-SE29.date=20160625
-holiday.sv-SE30.name=Juldagen
+holiday.sv-SE30.name=Alla Helgons Dag
-holiday.sv-SE30.date=20211225
+holiday.sv-SE30.date=20161105
-holiday.sv-SE31.name=Annandag jul
+holiday.sv-SE31.name=Julafton
-holiday.sv-SE31.date=20211226
+holiday.sv-SE31.date=20161224
-holiday.sv-SE32.name=Nyårsafton
+holiday.sv-SE32.name=Juldagen
-holiday.sv-SE32.date=20211231
+holiday.sv-SE32.date=20161225
 holiday.sv-SE33.name=Annandag jul
 holiday.sv-SE33.date=20161226
 holiday.sv-SE34.name=Nyårsafton
 holiday.sv-SE34.date=20161231
--- a/doc/rc/holidays.tr-TR.rc
+++ b/doc/rc/holidays.tr-TR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# https://holidata.net/tr-TR/2020.json
+# http://holidata.net/tr-TR/2015.json
-# https://holidata.net/tr-TR/2021.json
+# http://holidata.net/tr-TR/2016.json
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,63 +23,59 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.tr-TR1.name=Yılbaşı
-holiday.tr-TR1.date=20200101
+holiday.tr-TR1.date=20150101
 holiday.tr-TR2.name=Ulusal Egemenlik ve Çocuk Bayramı
-holiday.tr-TR2.date=20200423
+holiday.tr-TR2.date=20150423
 holiday.tr-TR3.name=Emek ve Dayanışma Günü
-holiday.tr-TR3.date=20200501
+holiday.tr-TR3.date=20150501
-holiday.tr-TR4.name=Atatürk'ü Anma, Gençlik ve Spor Bayramı
+holiday.tr-TR4.name=Atatürk'ü Anma Gençlik ve Spor Bayramı
-holiday.tr-TR4.date=20200519
+holiday.tr-TR4.date=20150519
-holiday.tr-TR5.name=Ramazan Bayramı (1. Gün)
+holiday.tr-TR5.name=Zafer Bayramı
-holiday.tr-TR5.date=20200524
+holiday.tr-TR5.date=20150830
-holiday.tr-TR6.name=Ramazan Bayramı (2. Gün)
+holiday.tr-TR6.name=Cumhuriyet Bayramı
-holiday.tr-TR6.date=20200525
+holiday.tr-TR6.date=20151029
-holiday.tr-TR7.name=Ramazan Bayramı (3. Gün)
+holiday.tr-TR7.name=Ramazan Bayramı 1
-holiday.tr-TR7.date=20200526
+holiday.tr-TR7.date=20150717
-holiday.tr-TR8.name=Demokrasi ve Milli Birlik Günü
+holiday.tr-TR8.name=Ramazan Bayramı 2
-holiday.tr-TR8.date=20200715
+holiday.tr-TR8.date=20150718
-holiday.tr-TR9.name=Kurban Bayramı (1. Gün)
+holiday.tr-TR9.name=Ramazan Bayramı 3
-holiday.tr-TR9.date=20200731
+holiday.tr-TR9.date=20150719
-holiday.tr-TR10.name=Kurban Bayramı (2. Gün)
+holiday.tr-TR10.name=Kurban Bayramı 1
-holiday.tr-TR10.date=20200801
+holiday.tr-TR10.date=20150923
-holiday.tr-TR11.name=Kurban Bayramı (3. Gün)
+holiday.tr-TR11.name=Kurban Bayramı 2
-holiday.tr-TR11.date=20200802
+holiday.tr-TR11.date=20150924
-holiday.tr-TR12.name=Kurban Bayramı (4. Gün)
+holiday.tr-TR12.name=Kurban Bayramı 3
-holiday.tr-TR12.date=20200803
+holiday.tr-TR12.date=20150925
-holiday.tr-TR13.name=Zafer Bayramı
+holiday.tr-TR13.name=Kurban Bayramı 4
-holiday.tr-TR13.date=20200830
+holiday.tr-TR13.date=20150926
-holiday.tr-TR14.name=Cumhuriyet Bayramı
+holiday.tr-TR14.name=Yılbaşı
-holiday.tr-TR14.date=20201029
+holiday.tr-TR14.date=20160101
-holiday.tr-TR15.name=Yılbaşı
+holiday.tr-TR15.name=Ulusal Egemenlik ve Çocuk Bayramı
-holiday.tr-TR15.date=20210101
+holiday.tr-TR15.date=20160423
-holiday.tr-TR16.name=Ulusal Egemenlik ve Çocuk Bayramı
+holiday.tr-TR16.name=Emek ve Dayanışma Günü
-holiday.tr-TR16.date=20210423
+holiday.tr-TR16.date=20160501
-holiday.tr-TR17.name=Emek ve Dayanışma Günü
+holiday.tr-TR17.name=Atatürk'ü Anma Gençlik ve Spor Bayramı
-holiday.tr-TR17.date=20210501
+holiday.tr-TR17.date=20160519
-holiday.tr-TR18.name=Ramazan Bayramı (1. Gün)
+holiday.tr-TR18.name=Zafer Bayramı
-holiday.tr-TR18.date=20210513
+holiday.tr-TR18.date=20160830
-holiday.tr-TR19.name=Ramazan Bayramı (2. Gün)
+holiday.tr-TR19.name=Cumhuriyet Bayramı
-holiday.tr-TR19.date=20210514
+holiday.tr-TR19.date=20161029
-holiday.tr-TR20.name=Ramazan Bayramı (3. Gün)
+holiday.tr-TR20.name=Ramazan Bayramı 1
-holiday.tr-TR20.date=20210515
+holiday.tr-TR20.date=20160705
-holiday.tr-TR21.name=Atatürk'ü Anma, Gençlik ve Spor Bayramı
+holiday.tr-TR21.name=Ramazan Bayramı 2
-holiday.tr-TR21.date=20210519
+holiday.tr-TR21.date=20160706
-holiday.tr-TR22.name=Demokrasi ve Milli Birlik Günü
+holiday.tr-TR22.name=Ramazan Bayramı 3
-holiday.tr-TR22.date=20210715
+holiday.tr-TR22.date=20160707
-holiday.tr-TR23.name=Kurban Bayramı (1. Gün)
+holiday.tr-TR23.name=Kurban Bayramı 1
-holiday.tr-TR23.date=20210720
+holiday.tr-TR23.date=20160912
-holiday.tr-TR24.name=Kurban Bayramı (2. Gün)
+holiday.tr-TR24.name=Kurban Bayramı 2
-holiday.tr-TR24.date=20210721
+holiday.tr-TR24.date=20160913
-holiday.tr-TR25.name=Kurban Bayramı (3. Gün)
+holiday.tr-TR25.name=Kurban Bayramı 3
-holiday.tr-TR25.date=20210722
+holiday.tr-TR25.date=20160914
-holiday.tr-TR26.name=Kurban Bayramı (4. Gün)
+holiday.tr-TR26.name=Kurban Bayramı 4
-holiday.tr-TR26.date=20210723
+holiday.tr-TR26.date=20160915
 holiday.tr-TR27.name=Zafer Bayramı
 holiday.tr-TR27.date=20210830
 holiday.tr-TR28.name=Cumhuriyet Bayramı
 holiday.tr-TR28.date=20211029
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/no-color.theme
+++ b/doc/rc/no-color.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
--- a/doc/ref/task-ref.pages
+++ b/doc/ref/task-ref.pages
--- a/doc/ref/task-ref.pdf
+++ b/doc/ref/task-ref.pdf
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,82 +0,0 @@
 version: '3'
 services:
  test-centos7:
    build:
        context: .
        dockerfile: test/docker/centos7
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-fedora28:
    build:
        context: .
        dockerfile: test/docker/fedora28
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-fedora29:
    build:
        context: .
        dockerfile: test/docker/fedora29
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-ubuntu1604:
    build:
        context: .
        dockerfile: test/docker/ubuntu1604
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-ubuntu1804:
    build:
        context: .
        dockerfile: test/docker/ubuntu1804
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-debianstable:
    build:
        context: .
        dockerfile: test/docker/debianstable
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-debiantesting:
    build:
        context: .
        dockerfile: test/docker/debiantesting
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-gentoo:
    build:
        context: .
        dockerfile: test/docker/gentoo
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-opensuse1500:
    build:
        context: .
        dockerfile: test/docker/opensuse1500
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-arch180101:
    build:
        context: .
        dockerfile: test/docker/arch180101
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
--- a/performance/CMakeLists.txt
+++ b/performance/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 2.8)
 add_custom_target (performance ./run_perf
                               DEPENDS task_executable
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 2.8)
 install (DIRECTORY bash fish vim zsh hooks
         DESTINATION ${TASK_DOCDIR}/scripts)
 install (DIRECTORY add-ons
--- a/scripts/add-ons/README
+++ b/scripts/add-ons/README
@@ -1,3 +1,3 @@
 The import/export add-on scripts have been relocated online. Please see:
-https://taskwarrior.org/tools
+https://taskwarrior.org/tools/#exts
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 ################################################################################
 ##
-## Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+## Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
-## https://www.opensource.org/licenses/mit-license.php
+## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
@@ -130,8 +130,8 @@ my $current = (localtime (time))[5] + 1900;
 my $next    = $current + 1;
 # Construct the holidata.net URL.
-my $url_current = "https://holidata.net/${locale}/${current}.json";
+my $url_current = "http://holidata.net/${locale}/${current}.json";
-my $url_next    = "https://holidata.net/${locale}/${next}.json";
+my $url_next    = "http://holidata.net/${locale}/${next}.json";
 # Fetch data for the current year.
 my $data_current = get ($url_current);
@@ -189,7 +189,7 @@ if (open my $fh, '>:utf8', $file)
        "# ${url_current}\n",
        "# ${url_next}\n",
        "#\n",
-        "# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.\n",
+        "# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.\n",
        "#\n",
        "# Permission is hereby granted, free of charge, to any person obtaining a copy\n",
        "# of this software and associated documentation files (the \"Software\"), to deal\n",
@@ -209,7 +209,7 @@ if (open my $fh, '>:utf8', $file)
        "# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n",
        "# SOFTWARE.\n",
        "#\n",
-        "# https://www.opensource.org/licenses/mit-license.php\n",
+        "# http://www.opensource.org/licenses/mit-license.php\n",
        "#\n",
        "###############################################################################\n",
        "\n",
--- a/scripts/bash/task.sh
+++ b/scripts/bash/task.sh
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 ################################################################################
 #
@@ -72,7 +72,7 @@ _task_offer_contexts() {
    COMPREPLY=( $(compgen -W "$($taskcommand _context) define delete list none show" -- $cur) )
 }
-_task_context_alias=$($taskcommand show | grep 'alias.*context' | cut -d' ' -f1 | cut -d. -f2)
+_task_context_alias=$($taskcommand show | grep alias.*context | cut -d' ' -f1 | cut -d. -f2)
 _task()
 {
--- a/scripts/bash/task_functions.sh
+++ b/scripts/bash/task_functions.sh
@@ -0,0 +1,26 @@
 CONFIRM_PROMPT='are you sure'
 task_config ()
 {
    var="${1}"
    shift
    value="${@}"
    echo y | task config $var "$value" | grep -iv "$CONFIRM_PROMPT"
 }
 task_vars ()
 {
    task _show | grep "^.*${1}.*=" | cut -d'=' -f1
 }
 task_get ()
 {
    task _show | grep "^${1}=" | cut -d'=' -f2
 }
 task_color ()
 {
    color="${1}"
    shift
    text="${@}"
    task rc.verbose=nothing rc._forcecolor=yes color ${color} | grep 'task color' | \
       tail -n 1 | sed -e 's/^  //' -e "s/task color ${color}/${text}/"
 }
--- a/scripts/fish/task.fish
+++ b/scripts/fish/task.fish
@@ -33,7 +33,7 @@
 # set -g task_complete_attribute_modifiers yes
 #
 #
-# Copyright 2014 - 2020, Roman Inflianskas <infroma@gmail.com>
+# Copyright 2014 - 2016, Roman Inflianskas <infroma@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -53,7 +53,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 # NOTE: remember that sed on OS X is different in some aspects. E.g. it does
 #       not understand \t for tabs.
@@ -186,7 +186,7 @@ end
 function __fish.task.list.command
  # ignore special commands
-  __fish.task.list._command $argv | command grep -Ev '^_'
+  __fish.task.list._command $argv | grep -Ev '^_'
 end
 function __fish.task.list.command_mods
--- a/scripts/utils/l10n
+++ b/scripts/utils/l10n
@@ -0,0 +1,195 @@
 #!/usr/bin/env python2.7
 ################################################################################
 ##
 ## Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights
 ## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 ## copies of the Software, and to permit persons to whom the Software is
 ## furnished to do so, subject to the following conditions:
 ##
 ## The above copyright notice and this permission notice shall be included
 ## in all copies or substantial portions of the Software.
 ##
 ## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 ## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 ## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ## SOFTWARE.
 ##
 ## http://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
 from __future__ import print_function
 from __future__ import unicode_literals
 import os
 import sys
 import argparse
 import re
 import fnmatch
 REFERENCE = 'eng-USA.h'
 def find_localizations(source, single=''):
  '''Finds all [a-z][a-z]-[A-Z][A-Z].h files in the source tree.'''
  found = []
  for path, dirs, files in os.walk(source, topdown=True, onerror=None, followlinks=False):
    matches = map(lambda x: os.path.join(path, x),
                  fnmatch.filter(files, '[a-z][a-z][a-z]-[A-Z][A-Z][A-Z].h'))
    if single:
      # Accept both cases - if user specified es-ES.h or only es-ES
      if not single.endswith('.h'):
        single = '%s.h' % single
      for match in matches:
        if match.endswith(single) or match.endswith(REFERENCE):
          found.append(match)
    else:
      found.extend(matches)
  # Make sure REFERENCE is the first column.
  # NOTE Empty string is always sorted first than any string
  found.sort(key=lambda x: "" if x.endswith(REFERENCE) else x)
  return found
 def read_file(translations, file):
  '''Reads all the localized strings from a file.'''
  translations[file] = {}
  with open(file, 'r') as fh:
    for match in re.findall(r'^\s*#define\s+(STRING_[^\s]+)(\s|\\)+"([^"]*)"', fh.read(), re.MULTILINE):
      translations[file][match[0]] = match[2]
 def is_present(translations, file, string):
  '''Determines if the string is defined in a translation.'''
  return string in translations[file]
 def used_in_source(source, string):
  '''Determines if the string is used in the source.'''
  command = "git grep %s %s | grep -v [a-z][a-z][a-z]-[A-Z][A-Z][A-Z].h >/dev/null 2>&1" % (string, source)
  return True if os.system(command) == 0 else False
 def is_translated(translations, file, string):
  '''Determines whether the string is the same in the base version as in the
     translation, indicating work needed.'''
  if file == base:
    return True
  elif string not in translations[base]:
    return True
  elif string not in translations[file]:
    return False
  else:
    return bool(translations[file][string] != translations[base][string])
 def main(args):
  '''Processes all the localized files.'''
  errors = 0
  translations = {}
  for file in args.files:
    # Verify all files exist.
    if not os.path.exists(file):
      raise Exception("Localized file '%s' not readable." % file)
    read_file(translations, file)
  strings = set()
  for file in translations:
    for string in translations[file]:
      strings.add(string)
  if len(strings) == 0:
    if not args.quiet:
      print("There are no localized strings found.")
    errors = 1
  # Get length of longest string ID.
  longest_string = len(max(strings, key=len))
  # Display info.
  if not args.quiet:
    print('Scanning in', args.source)
    print()
  # Print header line.
  files = map(lambda x: os.path.basename(x), args.files)
  if not args.quiet:
    print('%-*s' % (longest_string, 'String ID'), end='')
    print(*map(lambda x: '%10s' % x, files), sep='')
    print('-' * longest_string, ' '.join(['---------'] * len(files)))
  for string in sorted(strings):
    # assess status of 'string':
    # - clean
    line = ''
    line_errors = 0
    for file in args.files:
      message = '        '
      if is_present(translations, file, string):
        if is_translated(translations, file, string):
          message = ' [30;42mOk       [0m'
        else:
          message = ' [30;43mTODO     [0m'
      else:
        message = ' [37;41mMissing  [0m'
        line_errors = 1
      line += message
    if args.all or line_errors != 0:
      if args.search:
        if used_in_source(args.source, string):
          if not args.quiet:
            print('%-*s' % (longest_string, string), line, sep='')
        else:
          if not args.quiet:
            print('[37;41m%-*s[0m' % (longest_string, string), line, sep='')
          line_errors = 1
      else:
        if not args.quiet:
          print('%-*s' % (longest_string, string), line, sep='')
    if line_errors:
      errors = 1
  if not args.quiet:
    print('-' * longest_string, ' '.join(['---------'] * len(files)))
    print('%-*s' % (longest_string, 'Total'), end='')
    for file in args.files:
      print('%10d' % len(translations[file]), end='')
    print()
  sys.exit(errors)
 if __name__ == "__main__":
  usage="""Utility for checking localized string status across translations."""
  parser = argparse.ArgumentParser(description=usage)
  parser.add_argument('--source', action='store', required=True, help='The source code tree.')
  parser.add_argument('--single', action='store', help='Show only given localization next to reference.')
  parser.add_argument('--all', action='store_true', help='Show all string IDs.')
  parser.add_argument('--search', action='store_true', help='Search source for use.')
  parser.add_argument('--quiet', action='store_true', help='Produces no output.')
  args = parser.parse_args()
  if args.source:
    args.files = find_localizations(args.source)
    if args.single:
      args.files = find_localizations(args.source, args.single)
  base = filter(lambda x: x.endswith(REFERENCE), args.files)[0]
  try:
    main(args)
  except Exception as msg:
    print('Error:', msg)
--- a/scripts/vim/README
+++ b/scripts/vim/README
@@ -53,7 +53,7 @@ You should then be ready to go.
 ---
 All four above mentioned files are
-Copyright 2009 - 2020 John Florian
+Copyright 2009 - 2016 John Florian
 and are available under the MIT license.
 For the full text of this license, see COPYING.
--- a/scripts/vim/ftdetect/task.vim
+++ b/scripts/vim/ftdetect/task.vim
@@ -4,7 +4,7 @@
 " Maintainer:   John Florian <jflorian@doubledog.org>
 " Updated:	Thu Dec 10 18:28:26 EST 2009
 "
-" Copyright 2009 - 2020 John Florian
+" Copyright 2009 - 2016 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
@@ -16,7 +16,6 @@ au BufRead,BufNewFile backlog.data	set filetype=javascript
 " Taskwarrior configuration file
 au BufRead,BufNewFile .taskrc				set filetype=taskrc
 au BufRead,BufNewFile taskrc				set filetype=taskrc
 " Taskwarrior handling of 'task 42 edit'
 au BufRead,BufNewFile *.task				set filetype=taskedit
--- a/scripts/vim/syntax/taskdata.vim
+++ b/scripts/vim/syntax/taskdata.vim
@@ -3,7 +3,7 @@
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Wed Jul  8 19:46:20 EDT 2009
 "
-" Copyright 2009 - 2020 John Florian
+" Copyright 2009 - 2016 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/vim/syntax/taskedit.vim
+++ b/scripts/vim/syntax/taskedit.vim
@@ -3,7 +3,7 @@
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Wed Jul  8 19:46:32 EDT 2009
 "
-" Copyright 2009 - 2020 John Florian
+" Copyright 2009 - 2016 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/vim/syntax/taskrc.vim
+++ b/scripts/vim/syntax/taskrc.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 "
-" Copyright (c) 2014 - 2020 Taskwarrior Team
+" Copyright (c) 2014 - 2016 Taskwarrior Team
 " Copyright (c) 2009 - 2014 John Florian
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -21,7 +21,7 @@
 " OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 " SOFTWARE.
 "
-" https://www.opensource.org/licenses/mit-license.php
+" http://www.opensource.org/licenses/mit-license.php
 "
 if version < 600
@@ -102,7 +102,6 @@ syn match taskrcGoodKey '^\s*\Vdefault.command='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefault.due='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefault.priority='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefault.project='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefault.scheduled='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefaultheight='he=e-1
 syn match taskrcGoodKey '^\s*\Vdefaultwidth='he=e-1
 syn match taskrcGoodKey '^\s*\Vdependency.confirmation='he=e-1
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -1,6 +1,6 @@
 #compdef task
 #
-# Copyright 2010 - 2020 Johannes Schlatow
+# Copyright 2010 - 2016 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -21,205 +21,208 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# https://www.opensource.org/licenses/mit-license.php
+# http://www.opensource.org/licenses/mit-license.php
 #
 typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
 _task_projects=($(task _projects))
 _task_tags=($(task _tags))
 _task_zshids=( ${(f)"$(task _zshids)"} )
 _task_config=($(task _config))
 _task_columns=($(task _columns))
 _task_modifiers=(
  'before' \
  'after' \
  'none' \
  'any' \
  'is' \
  'isnt' \
  'has' \
  'hasnt' \
  'startswith' \
  'endswith' \
  'word' \
  'noword'
 )
 _task_conjunctions=(
  'and' \
  'or' \
  'xor' \
  '\)' \
  '\(' \
  '<' \
  '<=' \
  '=' \
  '!=' \
  '>=' \
  '>'
 )
 _task_cmds=($(task _commands; task _aliases))
 _task_zshcmds=( ${(f)"$(task _zshcommands)"} sentinel:sentinel:sentinel )
 _task_aliases=($(task _aliases))
 _task() {
    _arguments -s -S \
        "*::task default:_task_default"
    return 0
 }
 local -a reply args word
 word=$'[^\0]#\0'
 # priorities
 local -a task_priorities
 _regex_words values 'task priorities' \
  'H:High' \
  'M:Middle' \
  'L:Low'
 task_priorities=("$reply[@]")
 # projects
 local -a task_projects
 task_projects=(
  /"$word"/
  ":values:task projects:compadd -a _task_projects"
 )
 local -a _task_dates
 _regex_words values 'task dates' \
  'tod*ay:Today' \
  'yes*terday:Yesterday' \
  'tom*orrow:Tomorrow' \
  'sow:Start of week' \
  'soww:Start of work week' \
  'socw:Start of calendar week' \
  'som:Start of month' \
  'soq:Start of quarter' \
  'soy:Start of year' \
  'eow:End of week' \
  'eoww:End of work week' \
  'eocw:End of calendar week' \
  'eom:End of month' \
  'eoq:End of quarter' \
  'eoy:End of year' \
  'mon:Monday' \
  'tue:Tuesday'\
  'wed:Wednesday' \
  'thu:Thursday' \
  'fri:Friday' \
  'sat:Saturday' \
  'sun:Sunday' \
  'good*friday:Good Friday' \
  'easter:Easter' \
  'eastermonday:Easter Monday' \
  'ascension:Ascension' \
  'pentecost:Pentecost' \
  'midsommar:Midsommar' \
  'midsommarafton:Midsommarafton' \
  'later:Later' \
  'someday:Some Day'
 _task_dates=("$reply[@]")
 local -a _task_reldates
 _regex_words values 'task reldates' \
  'hrs:n hours' \
  'day:n days' \
  '1st:first' \
  '2nd:second' \
  '3rd:third' \
  'th:4th, 5th, etc.' \
  'wks:weeks'
 _task_reldates=("$reply[@]")
 task_dates=(
  \( "$_task_dates[@]" \|
    \( /$'[0-9][0-9]#'/- \( "$_task_reldates[@]" \) \)
  \)
 )
 local -a task_zshids
 if (( $#_task_zshids )); then
  _regex_words values 'task IDs' $_task_zshids
  task_zshids=("$reply[@]")
 fi
 _regex_words values 'task frequencies' \
  'daily:Every day' \
  'day:Every day' \
  'weekdays:Every day skipping weekend days' \
  'weekly:Every week' \
  'biweekly:Every two weeks' \
  'fortnight:Every two weeks' \
  'monthly:Every month' \
  'quarterly:Every three months' \
  'semiannual:Every six months' \
  'annual:Every year' \
  'yearly:Every year' \
  'biannual:Every two years' \
  'biyearly:Every two years'
 _task_freqs=("$reply[@]")
 local -a _task_frequencies
 _regex_words values 'task frequencies' \
  'd:days' \
  'w:weeks' \
  'q:quarters' \
  'y:years'
 _task_frequencies=("$reply[@]")
 task_freqs=(
  \( "$_task_freqs[@]" \|
     \( /$'[0-9][0-9]#'/- \( "$_task_frequencies[@]" \) \)
  \)
 )
 # attributes
 local -a task_attributes
 _regex_words -t ':' default 'task attributes' \
  'des*cription:Task description text' \
  'status:Status of task - pending, completed, deleted, waiting' \
  'pro*ject:Project name:$task_projects' \
  'pri*ority:priority:$task_priorities' \
  'du*e:Due date:$task_dates' \
  're*cur:Recurrence frequency:$task_freqs' \
  'un*til:Expiration date:$task_dates' \
  'li*mit:Desired number of rows in report' \
  'wa*it:Date until task becomes pending:$task_dates' \
  'ent*ry:Date task was created:$task_dates' \
  'end:Date task was completed/deleted:$task_dates' \
  'st*art:Date task was started:$task_dates' \
  'sc*heduled:Date task is scheduled to start:$task_dates' \
  'dep*ends:Other tasks that this task depends upon:$task_zshids'
 task_attributes=("$reply[@]")
 args=(
  \( "$task_attributes[@]" \|
  \( /'(project|description|status|entry|end|start|scheduled|depends|due|wait|recur|priority|until|limit).'/- \( /$'[^:]#:'/ ":default:modifiers:compadd -S ':' -a _task_modifiers" \) \) \|
  \( /'(rc).'/- \( /$'[^:]#:'/ ":arguments:config:compadd -S ':' -a _task_config" \) \) \|
  \( /'(+|-)'/- \( /"$word"/ ":values:remove tag:compadd -a _task_tags" \) \) \|
  \( /"$word"/ \)
  \) \#
 )
 _regex_arguments _task_attributes "${args[@]}"
 ## task commands
 # filter completion
 (( $+functions[_task_filter] )) ||
 _task_filter() {
  local -a reply
  local word=$'[^\0]#\0'
  # projects
  local _task_projects=($(task _projects))
  local task_projects=(
    /"$word"/
    ":values:task projects:compadd -a _task_projects"
  )
  _regex_words values 'task dates' \
    'tod*ay:Today' \
    'yes*terday:Yesterday' \
    'tom*orrow:Tomorrow' \
    'sow:Start of week' \
    'soww:Start of work week' \
    'socw:Start of calendar week' \
    'som:Start of month' \
    'soq:Start of quarter' \
    'soy:Start of year' \
    'eow:End of week' \
    'eoww:End of work week' \
    'eocw:End of calendar week' \
    'eom:End of month' \
    'eoq:End of quarter' \
    'eoy:End of year' \
    'mon:Monday' \
    'tue:Tuesday'\
    'wed:Wednesday' \
    'thu:Thursday' \
    'fri:Friday' \
    'sat:Saturday' \
    'sun:Sunday' \
    'good*friday:Good Friday' \
    'easter:Easter' \
    'eastermonday:Easter Monday' \
    'ascension:Ascension' \
    'pentecost:Pentecost' \
    'midsommar:Midsommar' \
    'midsommarafton:Midsommarafton' \
    'later:Later' \
    'someday:Some Day'
  local _task_dates=("$reply[@]")
  _regex_words values 'task reldates' \
    'hrs:n hours' \
    'day:n days' \
    '1st:first' \
    '2nd:second' \
    '3rd:third' \
    'th:4th, 5th, etc.' \
    'wks:weeks'
  local _task_reldates=("$reply[@]")
  local task_dates=(
    \( "$_task_dates[@]" \|
      \( /$'[0-9][0-9]#'/- \( "$_task_reldates[@]" \) \)
    \)
  )
  # This data is a little bit differnt, it may contain any kind of character so
  # we parse it manually and quote using '${(q)_desc}' the descriptions
  local -a _task_zshids
  local _id desc
  task _zshids | while IFS=':' read _id desc; do
    _task_zshids+=("$_id:${(qq)desc}")
  done
  _regex_words values 'task IDs' $_task_zshids
  local task_zshids=("$reply[@]")
  _regex_words values 'task frequencies' \
    'daily:Every day' \
    'day:Every day' \
    'weekdays:Every day skipping weekend days' \
    'weekly:Every week' \
    'biweekly:Every two weeks' \
    'fortnight:Every two weeks' \
    'monthly:Every month' \
    'quarterly:Every three months' \
    'semiannual:Every six months' \
    'annual:Every year' \
    'yearly:Every year' \
    'biannual:Every two years' \
    'biyearly:Every two years'
  local _task_freqs=("$reply[@]")
  _regex_words values 'task frequencies' \
    'd:days' \
    'w:weeks' \
    'q:quarters' \
    'y:years'
  local _task_frequencies=("$reply[@]")
  local task_freqs=(
    \( "$_task_freqs[@]" \|
       \( /$'[0-9][0-9]#'/- \( "$_task_frequencies[@]" \) \)
    \)
  )
  # task statuses
  local _task_statuses=(
    pending
    completed
    deleted
    waiting
  )
  _regex_words statuses 'task statuses' \
    "${_task_statuses}"
  local task_statuses=("${reply[@]}")
  # attributes
  local _task_all_attributes=(
    'des*cription:Task description text'
    'status:Status of task:$task_statuses'
    'pro*ject:Project name:$task_projects'
    'du*e:Due date:$task_dates'
    're*cur:Recurrence frequency:$task_freqs'
    'un*til:Expiration date:$task_dates'
    'li*mit:Desired number of rows in report'
    'wa*it:Date until task becomes pending:$task_dates'
    'ent*ry:Date task was created:$task_dates'
    'end:Date task was completed/deleted:$task_dates'
    'st*art:Date task was started:$task_dates'
    'sc*heduled:Date task is scheduled to start:$task_dates'
    'depends:Other tasks that this task depends upon:$task_zshids'
  )
  ## add UDAs as attributes
  local uda_name uda_label uda_values
  local -a udas_spec
  task _udas | while read uda_name; do
    uda_label="$(task _get rc.uda."$uda_name".label)"
    # TODO: we could have got the values of every uda and try to complete that
    # but that can become extremly slow with a lot of udas
    #uda_values=(${(@s:,:)"$(task _get rc.uda."$uda_name".values)"})
    udas_spec+=("${uda_name}:${(q)uda_label}")
  done
  _task_all_attributes=("${_task_all_attributes[@]}" "${udas_spec[@]}")
  _regex_words -t ':' default 'task attributes' "${_task_all_attributes[@]}"
  local task_attributes=("$reply[@]")
  local _task_tags=($(task _tags))
  local _task_config=($(task _config))
  local _task_modifiers=(
    'before'
    'after'
    'none'
    'any'
    'is'
    'isnt'
    'has'
    'hasnt'
    'startswith'
    'endswith'
    'word'
    'noword'
  )
  local _task_conjunctions=(
    'and'
    'or'
    'xor'
    '\)'
    '\('
    '<'
    '<='
    '='
    '!='
    '>='
    '>'
  )
  _regex_arguments _task_attributes \
    \( "${task_attributes[@]}" \| \
    \( /'(project|description|status|entry|end|start|scheduled|depends|due|wait|recur|priority|until|limit).'/- \( /$'[^:]#:'/ ":default:modifiers:compadd -S ':' -a _task_modifiers" \) \) \| \
    \( /'(rc).'/- \( /$'[^:]#:'/ ":arguments:config:compadd -S ':' -a _task_config" \) \) \| \
    \( /'(+|-)'/- \( /"$word"/ ":values:remove tag:compadd -a _task_tags" \) \) \| \
    \( /"$word"/ \) \
    \) \#
  _task_attributes "$@"
  # TODO complete conjunctions only if the previous word is a filter expression, i.e. attribute, ID, any non-command
  _describe -t default 'task conjunctions' _task_conjunctions
 }
-# id-only completion
+# execute completion
-(( $+functions[_task_ids] )) ||
+(( $+functions[_task_execute] )) ||
-_task_ids() {
+_task_execute() {
-  local _ids=( ${(f)"$(task _zshids)"} )
+  _files
  _describe 'task ids' _ids
 }
-(( $+functions[_task_aliases] )) ||
+
-_task_aliases() {
+# id-only completion
-  local _aliases=( ${(f)"$(task _aliases)"} )
+(( $+functions[_task_id] )) ||
-  _describe 'task aliases' _aliases
+_task_id() {
  _describe -t values 'task IDs' _task_zshids
 }
 # subcommand-only function
@@ -230,7 +233,6 @@ _task_subcommands() {
  local cmd category desc
  local lastcategory=''
  # The list is sorted by category, in the right order.
  local _task_zshcmds=( ${(f)"$(task _zshcommands)"} sentinel:sentinel:sentinel )
  for _zshcmd in "$_task_zshcmds[@]"; do
    # Parse out the three fields
    cmd=${_zshcmd%%:*}
@@ -251,42 +253,33 @@ _task_subcommands() {
  done
 }
 ## contexts
 (( $+functions[_task_context] )) ||
 _task_context() {
  local _contexts=(${(f)"$(task _context)"})
  _describe 'task contexts' _contexts
 }
 ## first level completion => task sub-command completion
 (( $+functions[_task_default] )) ||
 _task_default() {
-  local cmd ret=1
+    local cmd ret=1
  integer i=1
  local _task_cmds=($(task _commands; task _aliases))
  while (( i < $#words ))
  do
    cmd="${_task_cmds[(r)$words[$i]]}"
    if (( $#cmd )); then
-      if (( $+functions[_task_${cmd}] )); then
+      _call_function ret _task_${cmd} ||
-        _task_${cmd}
+        _call_function ret _task_filter ||
-        return ret
+          _message "No command remaining."
      fi
      _call_function ret _task_filter ||
        _message "No command remaining."
      return ret
    fi
    (( i++ ))
  done
  # update IDs
  _task_zshids=( ${(f)"$(task _zshids)"} )
  _task_subcommands
-  # _task_ids
+  _describe -t tasks 'task IDs' _task_zshids
-  _task_aliases
+  _describe -t aliases 'task aliases' _task_aliases
  _call_function ret _task_filter
  return ret
 }
-_arguments -s -S \
+_task "$@"
    "*::task default:_task_default"
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -3,4 +3,3 @@ Makefile.in
 debug
 calc
 lex
 liblibshared.a
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2020, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-// https://www.opensource.org/licenses/mit-license.php
+// http://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ -32,8 +32,11 @@
 #include <Context.h>
 #include <Lexer.h>
 #include <Color.h>
-#include <shared.h>
+#include <text.h>
-#include <format.h>
+#include <util.h>
 #include <i18n.h>
 extern Context context;
 // Overridden by rc.abbreviation.minimum.
 int CLI2::minimumMatchLength = 3;
@@ -210,7 +213,7 @@ const std::string A2::dump () const
    else                             tags += "\033[32m"                + tag + "\033[0m ";
  }
-  return output + ' ' + atts + tags;
+  return output + " " + atts + tags;
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -233,7 +236,7 @@ void CLI2::getOverride (int argc, const char** argv, std::string& home, File& rc
      if (last_slash != std::string::npos)
        home = rc.parent ();
-      Context::getContext ().header (format ("Using alternate .taskrc file {1}", rc._data));
+      context.header (format (STRING_PARSER_ALTERNATE_RC, rc._data));
      // Keep looping, because if there are multiple rc:file arguments, the last
      // one should dominate.
@@ -246,7 +249,7 @@ void CLI2::getOverride (int argc, const char** argv, std::string& home, File& rc
 // Static method.
 void CLI2::getDataLocation (int argc, const char** argv, Path& data)
 {
-  std::string location = Context::getContext ().config.get ("data.location");
+  std::string location = context.config.get ("data.location");
  if (location != "")
    data = location;
@@ -260,7 +263,7 @@ void CLI2::getDataLocation (int argc, const char** argv, Path& data)
        raw.substr (0, 16) == "rc.data.location")
    {
      data = Directory (raw.substr (17));
-      Context::getContext ().header (format ("Using alternate data.location {1}", (std::string) data));
+      context.header (format (STRING_PARSER_ALTERNATE_DATA, (std::string) data));
      // Keep looping, because if there are multiple rc:file arguments, the last
      // one should dominate.
@@ -274,31 +277,22 @@ void CLI2::applyOverrides (int argc, const char** argv)
 {
  for (int i = 0; i < argc; ++i)
  {
    // Don't process any arguments after a '--'
    std::string raw = argv[i];
    if (raw == "--")
      break;
    // Overrides always start with 'rc.'
    if (raw.length () > 3 &&
        raw.substr (0, 3) == "rc.")
    {
      // Our separator can either be '=' or ':', so try and find both.
      auto sep = raw.find ('=', 3);
      if (sep == std::string::npos)
        sep = raw.find (':', 3);
      // Process our override if well-formed
      if (sep != std::string::npos)
      {
        std::string name  = raw.substr (3, sep - 3);
        std::string value = raw.substr (sep + 1);
-        Context::getContext ().config.set (name, value);
+        context.config.set (name, value);
-
+        context.footnote (format (STRING_PARSER_OVERRIDE_RC, name, value));
        if (Context::getContext ().verbose("override"))
          Context::getContext ().footnote (format ("Configuration override rc.{1}:{2}", name, value));
      }
    }
  }
@@ -382,7 +376,9 @@ void CLI2::handleArg0 ()
    A2 cal ("calendar", Lexer::Type::word);
    _args.push_back (cal);
  }
-  else
+  else if (basename == "task" ||
           basename == "tw" ||
           basename == "t")
  {
    _args.push_back (a);
  }
@@ -403,7 +399,6 @@ void CLI2::lexArguments ()
  {
    bool quoted = Lexer::wasQuoted (_original_args[i].attribute ("raw"));
    // Process single-token arguments.
    std::string lexeme;
    Lexer::Type type;
    Lexer lex (_original_args[i].attribute ("raw"));
@@ -427,13 +422,11 @@ void CLI2::lexArguments ()
      _args.push_back (a);
    }
    // Process muktiple-token arguments.
    else
    {
      std::string quote = "'";
      std::string escaped = _original_args[i].attribute ("raw");
-      escaped = str_replace (escaped, quote, "\\'");
+      str_replace (escaped, quote, "\\'");
      std::string::size_type cursor = 0;
      std::string word;
@@ -467,8 +460,8 @@ void CLI2::lexArguments ()
    }
  }
-  if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+  if (context.config.getInteger ("debug.parser") >= 2)
-    Context::getContext ().debug (dump ("CLI2::analyze lexArguments"));
+    context.debug (dump ("CLI2::analyze lexArguments"));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -498,7 +491,7 @@ void CLI2::demotion ()
    else if (a._lextype == Lexer::Type::pair &&
        canonicalize (canonical, "pseudo", a.attribute ("name")))
    {
-      Context::getContext ().config.set (canonical, a.attribute ("value"));
+      context.config.set (canonical, a.attribute ("value"));
      changes = true;
      // Equivalent to erasing 'a'.
@@ -509,16 +502,16 @@ void CLI2::demotion ()
  }
  if (changes &&
-      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      context.config.getInteger ("debug.parser") >= 2)
-    Context::getContext ().debug (dump ("CLI2::analyze demotion"));
+    context.debug (dump ("CLI2::analyze demotion"));
 }
 ////////////////////////////////////////////////////////////////////////////////
 // Intended to be called after ::add() to perform the final analysis.
 void CLI2::analyze ()
 {
-  if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+  if (context.config.getInteger ("debug.parser") >= 2)
-    Context::getContext ().debug (dump ("CLI2::analyze"));
+    context.debug (dump ("CLI2::analyze"));
  // Process _original_args.
  _args.clear ();
@@ -531,7 +524,7 @@ void CLI2::analyze ()
  {
    defaultCommand ();
    if (! findCommand ())
-      throw std::string ("You must specify a command or a task to modify.");
+      throw std::string (STRING_TRIVIAL_INPUT);
  }
  demotion ();
@@ -575,10 +568,10 @@ void CLI2::addContextFilter ()
    return;
  // Detect if any context is set, and bail out if not
-  std::string contextName = Context::getContext ().config.get ("context");
+  std::string contextName = context.config.get ("context");
  if (contextName == "")
  {
-    Context::getContext ().debug ("No context.");
+    context.debug ("No context.");
    return;
  }
@@ -589,23 +582,23 @@ void CLI2::addContextFilter ()
        a._lextype == Lexer::Type::number ||
        a._lextype == Lexer::Type::set)
    {
-      Context::getContext ().debug (format ("UUID/ID argument found '{1}', not applying context.", a.attribute ("raw")));
+      context.debug (format ("UUID/ID argument found '{1}', not applying context.", a.attribute ("raw")));
      return;
    }
  }
  // Apply context
-  Context::getContext ().debug ("Applying context: " + contextName);
+  context.debug ("Applying context: " + contextName);
-  std::string contextFilter = Context::getContext ().config.get ("context." + contextName);
+  std::string contextFilter = context.config.get ("context." + contextName);
  if (contextFilter == "")
-    Context::getContext ().debug ("Context '" + contextName + "' not defined.");
+    context.debug ("Context '" + contextName + "' not defined.");
  else
  {
    _context_filter_added = true;
    addFilter (contextFilter);
-    if (Context::getContext ().verbose ("context"))
+    if (context.verbose ("context"))
-      Context::getContext ().footnote (format ("Context '{1}' set. Use 'task context none' to remove.", contextName));
+      context.footnote (format ("Context '{1}' set. Use 'task context none' to remove.", contextName));
  }
 }
@@ -631,7 +624,7 @@ void CLI2::prepareFilter ()
  desugarFilterPatterns ();
  insertJunctions ();                 // Deliberately after all desugar calls.
-  if (Context::getContext ().verbose ("filter"))
+  if (context.verbose ("filter"))
  {
    std::string combined;
    for (const auto& a : _args)
@@ -639,14 +632,14 @@ void CLI2::prepareFilter ()
      if (a.hasTag ("FILTER"))
      {
        if (combined != "")
-          combined += ' ';
+          combined += " ";
        combined += a.attribute ("raw");
      }
    }
    if (combined.size ())
-      Context::getContext ().footnote (std::string ("Filter: ") + combined);
+      context.footnote (std::string (STRING_COLUMN_LABEL_FILTER) + ": " + combined);
  }
 }
@@ -659,13 +652,13 @@ const std::vector <std::string> CLI2::getWords ()
    if (a.hasTag ("MISCELLANEOUS"))
      words.push_back (a.attribute ("raw"));
-  if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+  if (context.config.getInteger ("debug.parser") >= 2)
  {
    Color colorOrigArgs ("gray10 on gray4");
    std::string message = " ";
    for (const auto& word : words)
-      message += colorOrigArgs.colorize (word) + ' ';
+      message += colorOrigArgs.colorize (word) + " ";
-    Context::getContext ().debug ("CLI2::getWords" + message);
+    context.debug ("CLI2::getWords" + message);
  }
  return words;
@@ -744,13 +737,13 @@ const std::string CLI2::dump (const std::string& title) const
      out << colorFilter.colorize (i->attribute ("raw"));
  }
-  out << '\n';
+  out << "\n";
  if (_args.size ())
  {
    out << "  _args\n";
    for (const auto& a : _args)
-      out << "    " << a.dump () << '\n';
+      out << "    " << a.dump () << "\n";
  }
  if (_id_ranges.size ())
@@ -759,21 +752,21 @@ const std::string CLI2::dump (const std::string& title) const
    for (const auto& range : _id_ranges)
    {
      if (range.first != range.second)
-        out << colorArgs.colorize (range.first + "-" + range.second) << ' ';
+        out << colorArgs.colorize (range.first + "-" + range.second) << " ";
      else
-        out << colorArgs.colorize (range.first) << ' ';
+        out << colorArgs.colorize (range.first) << " ";
    }
-    out << '\n';
+    out << "\n";
  }
  if (_uuid_list.size ())
  {
    out << "  _uuid_list\n    ";
    for (const auto& uuid : _uuid_list)
-      out << colorArgs.colorize (uuid) << ' ';
+      out << colorArgs.colorize (uuid) << " ";
-    out << '\n';
+    out << "\n";
  }
  return out.str ();
@@ -852,11 +845,11 @@ void CLI2::aliasExpansion ()
  while (action && counter++ < safetyValveDefault);
  if (counter >= safetyValveDefault)
-    Context::getContext ().debug (format ("Nested alias limit of {1} reached.", safetyValveDefault));
+    context.debug (format (STRING_PARSER_ALIAS_NEST, safetyValveDefault));
  if (changes &&
-      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      context.config.getInteger ("debug.parser") >= 2)
-    Context::getContext ().debug (dump ("CLI2::analyze aliasExpansion"));
+    context.debug (dump ("CLI2::analyze aliasExpansion"));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -890,8 +883,8 @@ void CLI2::canonicalizeNames ()
  }
  if (changes &&
-      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      context.config.getInteger ("debug.parser") >= 2)
-    Context::getContext ().debug (dump ("CLI2::analyze canonicalizeNames"));
+    context.debug (dump ("CLI2::analyze canonicalizeNames"));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -900,7 +893,7 @@ void CLI2::categorizeArgs ()
 {
  // Context is only applied for commands that request it.
  std::string command = getCommand ();
-  Command* cmd = Context::getContext ().commands[command];
+  Command* cmd = context.commands[command];
  if (cmd && cmd->uses_context ())
    addContextFilter ();
@@ -942,7 +935,7 @@ void CLI2::categorizeArgs ()
             ! cmd->accepts_miscellaneous ())
    {
      // No commands were expected --> error.
-      throw format ("The '{1}' command does not allow '{2}'.", command, a.attribute ("raw"));
+      throw format (STRING_PARSER_UNEXPECTED_ARG, command, a.attribute ("raw"));
    }
    else if (cmd                             &&
             ! cmd->accepts_filter ()        &&
@@ -966,7 +959,7 @@ void CLI2::categorizeArgs ()
               cmd->accepts_miscellaneous ())
    {
      // Error: internally inconsistent.
-      throw std::string ("Unknown error. Please report.");
+      throw std::string (STRING_UNKNOWN_ERROR);
    }
    else if (cmd                             &&
               cmd->accepts_filter ()        &&
@@ -1006,13 +999,13 @@ void CLI2::categorizeArgs ()
               cmd->accepts_miscellaneous ())
    {
      // Error: internally inconsistent.
-      throw std::string ("Unknown error. Please report.");
+      throw std::string (STRING_UNKNOWN_ERROR);
    }
  }
  if (changes &&
-      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      context.config.getInteger ("debug.parser") >= 2)
-    Context::getContext ().debug (dump ("CLI2::analyze categorizeArgs"));
+    context.debug (dump ("CLI2::analyze categorizeArgs"));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -1080,8 +1073,8 @@ void CLI2::parenthesizeOriginalFilter ()
    _args = reconstructed;
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::analyze parenthesizeOriginalFilter"));
+      context.debug (dump ("CLI2::analyze parenthesizeOriginalFilter"));
  }
 }
@@ -1112,7 +1105,7 @@ bool CLI2::findCommand ()
    a.tag ("CMD");
    // Apply command DNA as tags.
-    Command* command = Context::getContext ().commands[canonical];
+    Command* command = context.commands[canonical];
    if (command->read_only ())             a.tag ("READONLY");
    if (command->displays_id ())           a.tag ("SHOWSID");
    if (command->needs_gc ())              a.tag ("RUNSGC");
@@ -1121,8 +1114,8 @@ bool CLI2::findCommand ()
    if (command->accepts_modifications ()) a.tag ("ALLOWSMODIFICATIONS");
    if (command->accepts_miscellaneous ()) a.tag ("ALLOWSMISC");
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::analyze findCommand"));
+      context.debug (dump ("CLI2::analyze findCommand"));
    // Stop and indicate command found.
    return true;
@@ -1183,8 +1176,8 @@ void CLI2::desugarFilterTags ()
  {
    _args = reconstructed;
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter desugarFilterTags"));
+      context.debug (dump ("CLI2::prepareFilter desugarFilterTags"));
  }
 }
@@ -1209,8 +1202,8 @@ void CLI2::findStrayModifications ()
  }
  if (changes)
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter findStrayModifications"));
+      context.debug (dump ("CLI2::prepareFilter findStrayModifications"));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -1247,12 +1240,12 @@ void CLI2::desugarFilterAttributes ()
      //    )
      // Use this sequence in place of a single value.
      std::vector <A2> values = lexExpression (value);
-      if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      if (context.config.getInteger ("debug.parser") >= 2)
      {
-        Context::getContext ().debug ("CLI2::lexExpression " + name + ':' + value);
+        context.debug ("CLI2::lexExpression " + name + ":" + value);
        for (auto& v : values)
-          Context::getContext ().debug ("  " + v.dump ());
+          context.debug ("  " + v.dump ());
-        Context::getContext ().debug (" ");
+        context.debug (" ");
      }
      bool found = false;
@@ -1265,7 +1258,7 @@ void CLI2::desugarFilterAttributes ()
        //   date     --> yes
        //   duration --> yes
        bool evalSupported = true;
-        Column* col = Context::getContext ().columns[canonical];
+        Column* col = context.columns[canonical];
        if (col && col->type () == "string")
          evalSupported = false;
@@ -1277,7 +1270,7 @@ void CLI2::desugarFilterAttributes ()
        A2 op ("", Lexer::Type::op);
        op.tag ("FILTER");
-        A2 rhs ("", values[0]._lextype);
+        A2 rhs ("", Lexer::Type::string);
        rhs.tag ("FILTER");
        // Special case for '<name>:<value>'.
@@ -1364,27 +1357,22 @@ void CLI2::desugarFilterAttributes ()
 #endif
        }
        else
-          throw format ("Error: unrecognized attribute modifier '{1}'.", mod);
+          throw format (STRING_PARSER_UNKNOWN_ATTMOD, mod);
        reconstructed.push_back (lhs);
        reconstructed.push_back (op);
        // Do not modify this construct without full understanding.
-        // Getting this wrong breaks a whole lot of filtering tests.
+        if (values.size () == 1 || ! evalSupported)
        if (values.size () > 1 || evalSupported)
        {
-          for (auto& v : values)
+          if (Lexer::isDOM (rhs.attribute ("raw")))
-            reconstructed.push_back (v);
+            rhs._lextype = Lexer::Type::dom;
-        }
+
        else if (Lexer::isDOM (rhs.attribute ("raw")))
        {
          rhs._lextype = Lexer::Type::dom;
          reconstructed.push_back (rhs);
        }
        else
-        {
+          for (auto& v : values)
-          reconstructed.push_back (rhs);
+            reconstructed.push_back (v);
        }
        found = true;
      }
@@ -1411,8 +1399,8 @@ void CLI2::desugarFilterAttributes ()
  {
    _args = reconstructed;
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter desugarFilterAttributes"));
+      context.debug (dump ("CLI2::prepareFilter desugarFilterAttributes"));
  }
 }
@@ -1450,8 +1438,8 @@ void CLI2::desugarFilterPatterns ()
  {
    _args = reconstructed;
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter desugarFilterPatterns"));
+      context.debug (dump ("CLI2::prepareFilter desugarFilterPatterns"));
  }
 }
@@ -1468,7 +1456,7 @@ void CLI2::findIDs ()
 {
  bool changes = false;
-  if (Context::getContext ().config.getBoolean ("sugar"))
+  if (context.config.getBoolean ("sugar"))
  {
    bool previousFilterArgWasAnOperator = false;
    int filterCount = 0;
@@ -1492,7 +1480,8 @@ void CLI2::findIDs ()
        else if (a._lextype == Lexer::Type::set)
        {
          // Split the ID list into elements.
-          auto elements = split (a.attribute ("raw"), ',');
+          std::vector <std::string> elements;
          split (elements, a.attribute ("raw"), ',');
          for (auto& element : elements)
          {
@@ -1547,7 +1536,8 @@ void CLI2::findIDs ()
            a.tag ("FILTER");
            // Split the ID list into elements.
-            auto elements = split (raw, ',');
+            std::vector <std::string> elements;
            split (elements, raw, ',');
            for (const auto& element : elements)
            {
@@ -1588,8 +1578,8 @@ void CLI2::findIDs ()
  }
  if (changes)
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter findIDs"));
+      context.debug (dump ("CLI2::prepareFilter findIDs"));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -1597,7 +1587,7 @@ void CLI2::findUUIDs ()
 {
  bool changes = false;
-  if (Context::getContext ().config.getBoolean ("sugar"))
+  if (context.config.getBoolean ("sugar"))
  {
    for (const auto& a : _args)
    {
@@ -1649,8 +1639,8 @@ void CLI2::findUUIDs ()
  }
  if (changes)
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter findUUIDs"));
+      context.debug (dump ("CLI2::prepareFilter findUUIDs"));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -1734,8 +1724,8 @@ void CLI2::insertIDExpr ()
          else
          {
            bool ascending = true;
-            int low  = strtol (r->first.c_str (),  nullptr, 10);
+            int low  = strtol (r->first.c_str (),  NULL, 10);
-            int high = strtol (r->second.c_str (), nullptr, 10);
+            int high = strtol (r->second.c_str (), NULL, 10);
            if (low <= high)
              ascending = true;
            else
@@ -1796,8 +1786,8 @@ void CLI2::insertIDExpr ()
  {
    _args = reconstructed;
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter insertIDExpr"));
+      context.debug (dump ("CLI2::prepareFilter insertIDExpr"));
  }
 }
@@ -1833,8 +1823,8 @@ void CLI2::lexFilterArgs ()
  {
    _args = reconstructed;
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter lexFilterArgs"));
+      context.debug (dump ("CLI2::prepareFilter lexFilterArgs"));
  }
 }
@@ -1940,8 +1930,8 @@ void CLI2::desugarFilterPlainArgs ()
  {
    _args = reconstructed;
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter desugarFilterPlainArgs"));
+      context.debug (dump ("CLI2::prepareFilter desugarFilterPlainArgs"));
  }
 }
@@ -1994,8 +1984,8 @@ void CLI2::insertJunctions ()
  {
    _args = reconstructed;
-    if (Context::getContext ().config.getInteger ("debug.parser") >= 2)
+    if (context.config.getInteger ("debug.parser") >= 2)
-      Context::getContext ().debug (dump ("CLI2::prepareFilter insertJunctions"));
+      context.debug (dump ("CLI2::prepareFilter insertJunctions"));
  }
 }
@@ -2035,7 +2025,7 @@ void CLI2::defaultCommand ()
    if (! found_sequence)
    {
      // Apply overrides, if any.
-      std::string defaultCommand = Context::getContext ().config.get ("default.command");
+      std::string defaultCommand = context.config.get ("default.command");
      if (defaultCommand != "")
      {
        // Modify _args, _original_args to be:
@@ -2078,8 +2068,8 @@ void CLI2::defaultCommand ()
  }
  if (changes &&
-      Context::getContext ().config.getInteger ("debug.parser") >= 2)
+      context.config.getInteger ("debug.parser") >= 2)
-    Context::getContext ().debug (dump ("CLI2::analyze defaultCommand"));
+    context.debug (dump ("CLI2::analyze defaultCommand"));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -2123,5 +2113,3 @@ std::vector <A2> CLI2::lexExpression (const std::string& expression)
 }
 ////////////////////////////////////////////////////////////////////////////////
 // vim: ts=2:sw=2
--- a/Show More
+++ b/Show More
`@@ -1,3 +1,3 @@`
	`The import/export add-on scripts have been relocated online. Please see:`	`The import/export add-on scripts have been relocated online. Please see:`

	`https://taskwarrior.org/tools`	`https://taskwarrior.org/tools/#exts`