t

Fix?: modify files to glob justincase
Checking what happened in tmp
2026-01-29 16:14:44 +01:00 · 2026-01-29 16:08:28 +01:00 · 2026-01-29 16:05:22 +01:00 · 2026-01-29 15:53:19 +01:00 · 2026-01-29 15:51:00 +01:00 · 2026-01-29 15:47:30 +01:00
594 changed files with 27016 additions and 44102 deletions
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -0,0 +1,21 @@
 on:
  - push
 jobs:
  Release-Src:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
        uses: actions/checkout@v4
        with:
          submodules: True
      - name: Create Archive from full repo with submodule
        run: |
          mkdir /tmp/release
          tar -czf /tmp/release/taskwarrior2-full.tar.gz *
          ls /tmp/release
      - name: Release Archive
        uses: https://gitea.com/actions/gitea-release-action@v1
        with:
          files: /tmp/release/*
          sha256sum: True
--- a/.github.bak/FUNDING.yml
+++ b/.github.bak/FUNDING.yml
@@ -0,0 +1 @@
 github: GothenburgBitFactory
--- a/.github.bak/issue_template.md
+++ b/.github.bak/issue_template.md
@@ -0,0 +1,12 @@
 #### 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.bak/pull_request_template.md
+++ b/.github.bak/pull_request_template.md
@@ -0,0 +1,9 @@
 #### 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/.github.bak/workflows/tests.yaml
+++ b/.github.bak/workflows/tests.yaml
@@ -0,0 +1,64 @@
 name: tests
 on: [push, pull_request]
 jobs:
  tests:
    strategy:
      fail-fast: false
      matrix:
        include:
          - name: "Centos 8"
            runner: ubuntu-latest
            dockerfile: centos8
          - name: "Fedora 32"
            runner: ubuntu-latest
            dockerfile: fedora32
          - name: "Fedora 33"
            runner: ubuntu-latest
            dockerfile: fedora33
          - name: "Fedora 34"
            runner: ubuntu-latest
            dockerfile: fedora34
          - name: "Fedora 35"
            runner: ubuntu-latest
            dockerfile: fedora35
          - name: "Debian Testing"
            runner: ubuntu-latest
            dockerfile: debiantesting
          - name: "Ubuntu 18.04"
            runner: ubuntu-latest
            dockerfile: ubuntu1804
          - name: "Ubuntu 20.04"
            runner: ubuntu-latest
            dockerfile: ubuntu2004
          - name: "Ubuntu 21.04"
            runner: ubuntu-latest
            dockerfile: ubuntu2104
          - name: "Ubuntu 21.10"
            runner: ubuntu-latest
            dockerfile: ubuntu2110
          - name: "OpenSUSE 15"
            runner: ubuntu-latest
            dockerfile: opensuse15
          - name: "Archlinux Base (Rolling)"
            runner: ubuntu-latest
            dockerfile: arch
          - name: "Mac OS X 10.13"
            runner: macos-latest
            dockerfile: osx
    runs-on: ${{ matrix.runner }}
    continue-on-error: ${{ matrix.continue-on-error == true }}
    steps:
      - uses: actions/checkout@v2
      - name: Build ${{ matrix.name }}
        env:
          DOCKER_REGISTRY: docker.pkg.github.com
          DOCKER_CACHE_IMAGE: docker.pkg.github.com/${{ github.repository }}/taskwarrior_cache
          GITHUB_USER: ${{ github.actor }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CONTAINER: ${{ matrix.dockerfile }}
        run: if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER ; fi
      - name: Test ${{ matrix.name }}
        run: if [[ $CONTAINER != "osx" ]]; then docker-compose run test-$CONTAINER; else bash test/scripts/test_osx.sh ; fi
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CONTAINER: ${{ matrix.dockerfile }}
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ CPackSourceConfig.cmake
 patches
 *.exe
 tutorials
 .prove
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
 [submodule "src/libshared"]
 	path = src/libshared
 	url = https://github.com/GothenburgBitFactory/libshared.git
--- a/64
+++ b/64
@@ -3,6 +3,7 @@ contributions of the following people:
  Paul Beckingham    (Principal Author)
  Federico Hernandez (Principal Author)
  Tomas Babej        (Principal Author)
  David J Patrick    (Designer)
  John Florian       (Contributing Author)
  Cory Donnelly      (Contributing Author)
@@ -13,7 +14,6 @@ contributions of the following people:
  Louis-Claude Canon (Contributing Author)
  Scott Kostyshak    (Contributing Author)
  Renato Alves       (Contributing Author)
  Tomas Babej        (Contributing Author)
 The following submitted code, packages or analysis, and deserve special thanks:
@@ -126,7 +126,38 @@ The following submitted code, packages or analysis, and deserve special thanks:
  Sunil Joshi
  Misty De Meo
  Kent R. Spillner
-  Konstantin
+  Konstantin Vorobyev
  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
  Chad Phillips
  Lionel Miller
  Florian Heiderich
  Anthony VB
  Julien Rabinow
  Daniel Mowitz
  Scott Mcdermott
  Bharatvaj
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -274,7 +305,6 @@ suggestions:
  James Cline
  Ryan
  Simon W. Jackson
  Sebastien Badia
  Michale Meier
  Svetoslav Trochev
  Marc Cornellà
@@ -288,3 +318,31 @@ 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
  coaxial
  Arvedui
  reportaman
  Pablo Vizcay
  Jake C.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.5)
-set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 include (CheckFunctionExists)
 include (CheckStructHasMember)
@@ -7,7 +7,16 @@ include (CheckStructHasMember)
 set (HAVE_CMAKE true)
 project (task)
-set (PROJECT_VERSION "2.5.1")
+include (CXXSniffer)
 set (PROJECT_VERSION "2.6.2")
 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)
@@ -18,81 +27,14 @@ else (ENABLE_SYNC)
  message (WARNING "ENABLE_SYNC=OFF. Not building sync support.")
 endif (ENABLE_SYNC)
-message ("CMAKE_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}")
+message ("-- Looking for libshared")
-
+if (EXISTS ${CMAKE_SOURCE_DIR}/src/libshared/src)
-include (CheckCXXCompilerFlag)
+  message ("-- Found libshared")
-
+else (EXISTS ${CMAKE_SOURCE_DIR}/src/libshared/src)
-# NOTE: If we are to actually use C++11 features, we should either require
+  message ("-- Cloning libshared")
-#       a compiler that supports the -std=c++11 flag or check for the
+  execute_process (COMMAND git submodule update --init
-#       features used.
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-#       Relying on -std=c++0x or even -std=gnu++0x is highly volatile.
+endif (EXISTS ${CMAKE_SOURCE_DIR}/src/libshared/src)
 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)
@@ -107,12 +49,23 @@ endif (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
 set (PACKAGE "${PROJECT_NAME}")
 set (VERSION "${PROJECT_VERSION}")
-set (PACKAGE_BUGREPORT "support@taskwarrior.org")
+set (PACKAGE_BUGREPORT "support@gothenburgbitfactory.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)
@@ -159,22 +112,36 @@ else (HAVE_UUID_UNPARSE_LOWER)
  message ("-- Found libuuid, using internal uuid_unparse_lower")
 endif (HAVE_UUID_UNPARSE_LOWER)
-# Set the package language.
+if (HAIKU)
-if (LANGUAGE)
+  # search for socket() in libnetwork on Haiku
-  set (PACKAGE_LANGUAGE ${LANGUAGE})
+  message("-- Looking for libnetwork")
-else (LANGUAGE)
+  find_library (NETWORK_LIBRARY NAMES network)
-  set (PACKAGE_LANGUAGE 1)
+  if (NETWORK_LIBRARY)
-endif (LANGUAGE)
+    set (TASK_LIBRARIES    ${TASK_LIBRARIES} ${NETWORK_LIBRARY})
  else (NETWORK_LIBRARY)
    message(FATAL_ERROR "-- libnetwork not found.")
  endif (NETWORK_LIBRARY)
 endif (HAIKU)
-set (LANGUAGE_ENG_USA 1)
+if (SOLARIS)
-set (LANGUAGE_ESP_ESP 2)
+  # accept() is in libsocket according to its manpage
-set (LANGUAGE_DEU_DEU 3)
+  message("-- Looking for libsocket")
-set (LANGUAGE_FRA_FRA 4)
+  find_library (SOCKET_LIBRARY NAMES socket)
-set (LANGUAGE_ITA_ITA 5)
+  if (SOCKET_LIBRARY)
-set (LANGUAGE_POR_PRT 6)
+    set (TASK_LIBRARIES    ${TASK_LIBRARIES} ${SOCKET_LIBRARY})
-set (LANGUAGE_EPO_RUS 7)
+  else (SOCKET_LIBRARY)
-set (LANGUAGE_POL_POL 8)
+    message(FATAL_ERROR "-- libsocket not found.")
-set (LANGUAGE_JPN_JPN 9)
+  endif (SOCKET_LIBRARY)
  # inet_ntop() is in libnsl according to its manpage
  message("-- Looking for libnsl")
  find_library (NSL_LIBRARY NAMES nsl)
  if (NSL_LIBRARY)
    set (TASK_LIBRARIES    ${TASK_LIBRARIES} ${NSL_LIBRARY})
  else (NSL_LIBRARY)
    message(FATAL_ERROR "-- libnsl not found.")
  endif (NSL_LIBRARY)
 endif (SOLARIS)
 message ("-- Configuring cmake.h")
 configure_file (
@@ -198,6 +165,18 @@ foreach (doc_FILE ${doc_FILES})
  install (FILES ${doc_FILE}  DESTINATION ${TASK_DOCDIR})
 endforeach (doc_FILE)
 add_custom_command(OUTPUT run-review
    COMMAND docker build -q --build-arg PR=$(PR) --build-arg LIBPR=$(LIBPR) -t taskwarrior-review:$(PR)s$(LIBPR) - < scripts/review-dockerfile
    COMMAND docker run --rm --memory 1g --hostname pr-$(PR)s$(LIBPR) -it taskwarrior-review:$(PR)s$(LIBPR) bash || :
 )
 add_custom_target(review DEPENDS run-review)
 add_custom_command(OUTPUT run-reproduce
    COMMAND docker build -q --build-arg RELEASE=$(RELEASE) -t taskwarrior-reproduce:$(RELEASE) - < scripts/reproduce-dockerfile
    COMMAND docker run --rm --memory 1g --hostname tw-$(RELEASE) -it taskwarrior-reproduce:$(RELEASE) bash || :
 )
 add_custom_target(reproduce DEPENDS run-reproduce)
 # ---
 set (CPACK_SOURCE_GENERATOR "TGZ")
@@ -206,5 +185,7 @@ 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"
-                                "/\\\\.gitignore" "/\\\\.git/" "swp$" "src/lex$")
+                                "swp$" "src/lex$" "task-.*.tar.gz" "commit.h" "cmake.h$" "\\\\.gitmodules"
                                "src/libshared/\\\\.git" ".github/" ".*\\\\.gitignore$"
                                "src/liblibshared.a" "docker-compose.yml" "\\\\.git/")
 include (CPack)
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
 Taskwarrior - a command line task list manager.
-Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2021, Tomas Babej, 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.
-http://www.opensource.org/licenses/mit-license.php
+https://www.opensource.org/licenses/mit-license.php
--- a/362
+++ b/362
@@ -1,3 +1,341 @@
 ------ current release ---------------------------
 2.6.2 -
 - TW #502  Sequence of IDs doesn't work with attribute "depends"
           Thanks to Andreas Kalex and Reg for reporting.
 - TW #2648 xdg-open is not available on Mac OS-X
           Thanks to chapterjson for reporting.
 - TW #2655 The bulk removal of depends: and tags: is ignored
           Thanks to angelus2014 for reporting.
 - TW #2664 Tag exclusion should be detected as invalid write context
           Thanks to bentwitthold for reporting.
 - TW #2671 The value of soww named date is incorrect
           Thanks to Lennart Kill for reporting.
 - TW #2689 Corruption of the depends attribute upon syncing with taskd 1.1.0
           Thanks to Klaus Ethgen for reporting, Dusting J. Mitchell for
 		   contributing.
 - TW #2707 Assigning dependencies via ID ranges
           Thanks to jaker-dotcom for reporting.
 - TW #2748 Recurring report does not include parent tasks
           Thanks to Klaus Ethgen for reporting.
 2.6.1 (2021-10-19) - a696b6b155f9c8af87a6a496c0d298c58e6fe369
 - TW #2619 Fish autocompletion fails when completing tag removal
           Thanks to Alexandre Provencio for reporting, Tin Lai and Alexandre
           Provencio for contributing.
 - TW #2620 Old-style context definition should only be interpreted as read
           context.
           Thanks to bongoman and Tom Dörr for reporting.
 - TW #2622 Tags and dependencies appear as orphaned UDAs.
           Thanks to Scott Mcdermott for reporting.
 - TW #2626 Waiting report lists deleted and/or completed tasks.
           Thanks to Don Harper for reporting.
 - TW #2629 New-style context definition should take precedence over old-style
           even if the new-style is an empty string.
           Thanks to Denis Kasak for reporting.
 - TW #2632 Cannot build on Cygwin
           Thanks to Michael Esemplare for contributing.
 - TW #2639 Unable to use ranges for some tasks with IDs above 1000.
           Thanks to Manuel Haussmann for reporting.
 2.6.0 (2021-10-03) - 8174287f917a3b24c19a6601ba36fca9bdaa78c9
 - TW #1654 "Due" parsing behaviour seems inconsistent
           Thanks to Jim B for reporting.
 - TW #1788 When deleting recurring task all tasks, including completed tasks,
           are marked as deleted
           Thanks to Alan Young for reporting.
 - TW #1804 Importing malformed annotation (without entry timestamp) causes
           segmentation fault.
           Thanks to David Badura for reporting.
 - TW #1840 Countdown (date format) is not working properly
           Thanks to Eric Hymowitz for reporting, Sebastian Uharek for
           contributing.
 - TW #1847 Allow including files relative to $PREFIX/share/
           Thanks to Georg Sauthoff for suggesting, oxalica for contributing.
 - TW #1896 Parser cannot handle empty parentheses
 - TW #1908 Cannot create task with explicit description 'start ....'
           Thanks to Matt Chun-Lum for reporting.
 - TW #1911 Support holidays longer then 1 day
           Thanks to Daniel Mowitz for contributing.
 - TW #1913 Project names with dashes and attribute names fail to parse
           Thanks to Yanick Champoux for reporting.
 - TW #1914 Non-cumulative burndown report
           Thanks to Daniel Mowitz for contributing.
 - TW #1938 Missing annotation on import if entry is duplicated
           Thanks to Florian for reporting.
 - TW #1945 Support of environment variables for configuration options
           Thanks to Sebastian Uharek for contributing.
 - TW #1953 Setting rc.verbose=new-uuid override works only if given as first argument
           Thanks to Paul Fenwick for reporting.
 - TW #1955 Adding tasks in context.
           Thanks to Jean-Francois Joly, Matt Smith for suggesting.
 - TW #1960 Fixed bug with double escaped single quotes.
           Thanks to Ben Kelly for reporting, Sebastian Uharek for
           contributing.
 - TW #2004 "shell" should not be expand to "exec tasksh"
           Thanks to Arvedui for reporting.
 - TW #2007 Compute number of current tasks correctly
           Thanks to Janik Rabe for contributing.
 - TW #2017 Support 64-bit datetime values
           Thanks to Evgeniy Vasilev for suggesting.
 - TW #2023 Layout breaks if report does not fit in the available width
           Thanks to Adrian Sieber and Kaushik Gopal for reporting.
 - TW #2060 Review timestamp is displayed as unix time, not formatted
           Thanks to JavaZauber for reporting.
 - TW #2093 wrong order under projects command
           Thanks to Beka, Max Rossmannek for reporting.
 - TW #2101 Numeric UDA values above 2,147,483,647 overflow without warning
           Thanks to Adam Monsen for reporting.
 - TW #2136 Configuration options can be overwritten for current context
           Thanks to Sebastian Uharek for contributing.
 - TW #2160 Upper-case named dates are not supported
           Thanks to Scott Kostyshak for reporting, Max Rossmannek for
           contributing.
 - TW #2163 Nagging computation should be based on the urgency before completion
           Thanks to korrat for contributing.
 - TW #2208 Support highlighting dates with scheduled tasks in calendar
           Thanks to justf0rfun for suggesting, Sebastian Uharek for
           contributing.
 - TW #2247 Configuration override rc.verbose:off not respected
           Thanks to Vignesh Prabhu for reporting.
 - TW #2257 UDA string fields can't start with certain keywords
           Thanks to Michael Russell for reporting.
 - TW #2283 Support multi-line annotations in task edit without JSON encoding
           Thanks to Jochen Sprickerhof for contributing.
 - TW #2287 Speed up fish autocompletion and more completion options.
           Thanks to Tin Lai for contributing.
 - TW #2290 Support moving the config file to XDG_CONFIG_HOME
           Thanks to Julien Rabinow for contributing.
 - TW #2292 CmdEdit: Interruption should remove lock file
           Thanks to Martin Michlmayr for reporting, indev12 for contributing.
 - TW #2333 Width determination of Unicode characters now works for up to
           Unicode 12 (from Unicode 5). Emojis are correctly displayed.
           Thanks to Adam Monsen for reporting.
 - TW #2373 Year 2038 Problem
           Thanks to Stephan Rieche for reporting.
 - TW #2386 Filtering project:someday broken
           Thanks to FRebbel for reporting.
 - TW #2388 Filtering for attribute values with spaces is broken
           Thanks to angelus2014 for reporting.
 - TW #2389 For certain terminal widths, annotations with utf-8 chars can lead
           task to hang
           Thanks to arooni for reporting.
 - TW #2390 Regression: Relative dates should be implicitly anchored around 'now'
           Thanks to Dominik Russo for reporting.
 - TW #2392 Filtering for project-names containing hyphen and zero-leading number
           Thanks to Nicola Chiapolini for reporting.
 - TW #2393 Highlight due dates for waiting tasks in the calendar
           Thanks to emkamau for reporting.
 - TW #2403 Undefined symbols (with -DBUILD_SHARED_LIBS=ON)
           Thanks to Jan Palus for contributing.
 - TW #2422 "eow" and "eonw" seem to use different week day as reference
           Thanks to bgravato for reporting.
 - TW #2428 The "edit" command should respect "bulk" configuration option
           Thanks to Evan Edmond for reporting.
 - TW #2442 Bulk completions generate nagging message even if highest urgency
           task was completed
           Thanks to Daniel Mowitz for contributing.
 - TW #2451 Command task $month doesn't behave correctly
           Thanks to Matias Laporte for reporting.
 - TW #2502 Two GCC warnings on 2.6.0.
           Thanks to Scott Kostyshak for reporting.
 - TW #2503 Warn against executing an empty execute command.
           Thanks to heinrichat for reporting.
 - TW #2514 Duration values can be mis-reported in the task info output
           Thanks to reportaman for reporting.
 - TW #2519 Named date eod should be last minute of today and not first of
           tomorrow.
           Thanks to Pablo Vizcay for reporting.
 - TW #2530 Taskwarrior 2.5.3 time based filtering regression
           Thanks to Matthias Tafelmeier for reporting.
 - TW #2532 Show number of tasks to be modified in bulk updates
           Thanks to jaker-dotcom for suggesting, Sebastian Uharek for
 		   contributing.
 - TW #2536 Feature: inclusive range-end attribute modifier 'by' so 'end of'
           named dates can be filtered inclusively
           Thanks to Scott Mcdermott for contributing.
 - TW #2549 Write context with complex expressions should not be allowed
           Thanks to Sebastian Fricke for reporting.
 - TW #2550 Write context skipped if description contains an identifier
           Thanks to Sebastian Fricke for reporting.
 - TW #2554 Remove the waiting state, and consider any task with wait>now to be
           waiting
           Thanks to Dustin J. Mitchell for contributing.
 - TW #2560 Add report.<name>.context configuration variable
           Thanks to Jake C for suggesting.
 - TW #2461 The legend in calendar does not respect the calendar.holidays setting
 - TW #2569 The `json.depends.array` configuration option is now ignored.
           Dependencies are always represented as an array in JSON output.
           Thanks to Dustin J. Mitchell for contributing.
 - TW #2575 Support exporting given report as JSON, including sort order
           Thanks to Dheepak Krishnamurthy for contributing.
 - TW #2580 Importing malformed JSON task crashes TW
           Thanks to bharatvaj for contributing.
 - TW #2581 Config entry with a trailing comment cannot be modified
 ------ old releases ------------------------------
 2.5.3 (2021-01-05) - 2f47226f91f0b02f7617912175274d9eed85924f
 - #2375   task hangs then dies when certain tasks are present in a report
          Thanks to Max Rossmannek, Tomáš Janoušek and Chad Phillips.
 2.5.2 (2020-12-05) - b0c17d11639dc6e783befd89c8508f2abb9b4287
 - 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
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 - TD-104  Unrecognized taskwarrior file format
@@ -108,8 +446,6 @@
 - The 'run_all' script was not correctly using exit code 0 when all tests pass
          (thanks to Gordon Ball).
 ------ current release ---------------------------
 2.5.0 (2015-10-21) dd5968a61b1fab258b38879cfdbb7d67f1bcd550
 - TW-20   Task edit loses annotation precision, causing journal updating code
@@ -168,7 +504,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 beggining of the unix epoch (thanks
+- TW-1499 Invalid due date produces jump to beginning 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).
@@ -222,7 +558,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 mitnight (thanks to
+- TW-1634 due.not:<date> excludes only tasks scheduled at midnight (thanks to
          Tomas Babej).
 - TW-1635 Running "task anystringatall" does not filter anything (thanks to
          Tomas Babej).
@@ -323,8 +659,6 @@
  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).
@@ -435,7 +769,7 @@
          Babej).
 - TW-1505 completely ignore mis-named hook scripts (thanks to Tomas Babej,
          David Patrick).
- TW-1509 Hooks modifications performed on sync not sycning back (thanks to
+- TW-1509 Hooks modifications performed on sync not syncing 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
@@ -543,7 +877,7 @@
         "Description ( Information)".
 - TW-248 Substitute text doesn't work with forward slash (thanks to Jostein
         Berntsen).
- TW-249 Report filters don't allow parantheses (thanks to Philipp Woelfel).
+- TW-249 Report filters don't allow parentheses (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).
@@ -818,7 +1152,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 takwarrior.org (thank to Jakub Wilk).
+- #1248 Merge tests no longer connect to taskwarrior.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
@@ -884,7 +1218,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 formating dates ('n', 's' and 'v').
+- New characters for parsing and formatting 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,
@@ -1146,7 +1480,7 @@ Bugs
 - All holiday files have been renamed to include a locale, rather than just a
  country code.  For example: holidays.en-US.rc.
 - Now ships with an add-on script, update-holidays.pl, which contacts
-  http://holidata.net, and brings the installed holiday files up to date.
+  https://holidata.net, and brings the installed holiday files up to date.
 - Extension system now controlled by the 'extensions' configuration variable.
 - HTML export in the form of an external scripts export-html.pl.
 - Two additional solarized theme files, solarized-dark-256.theme and
@@ -1350,7 +1684,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 probles when completing recurring tasks (thanks
+- Fixed bug #824, which caused problems 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.
@@ -1429,7 +1763,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 foramt.
+- Fixed problem where update-holidays.pl did not use the YYYYMMDD date format.
 - 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).
@@ -1943,7 +2277,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
-  http://taskwarrior.org will provide better information.
+  https://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
@@ -1,168 +0,0 @@
 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
@@ -0,0 +1,146 @@
 # How to Build Taskwarrior
 ## Satisfy the Requirements:
 * CMake 3.0 or later
 * gcc 7.0 or later, clang 6.0 or later, or a compiler with full C++17 support
 * libuuid (if not on macOS)
 * gnutls (optional)
 * python 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 develop               # 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 test
    $ 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 or libera.chat.
    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.
--- a/210
+++ b/210
@@ -1,210 +0,0 @@
 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/51
+++ b/51
@@ -8,15 +8,15 @@ source.
 Dependencies
 ------------
-You will need the CMake build system installed in order to build Taskwarrior
+You will need the CMake 3.0+ build system installed in order to build Taskwarrior
-from source. More information on cmake can be obtained at http://cmake.org
+from source. More information on CMake can be obtained at https://cmake.org
 You will also need:
  - make
-You will need a C++ compiler that supports full C++11, which includes:
+You will need a C++ compiler that supports full C++17, which includes:
-  - gcc 4.7   (released 2012-03-23)
+  - gcc 7.1   (released 2017-05-02)
-  - clang 3.3 (released 2013-01-07)
+  - clang 5.0 (released 2017-09-07)
 You will need the following libraries:
  - libuuid (not needed for OSX)
@@ -103,26 +103,6 @@ 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
 --------------
@@ -161,10 +141,10 @@ Darwin, 32bit
    cmake -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32 .
  See:
-    http://taskwarrior.org/issues/817
+    https://taskwarrior.org/issues/817
-    http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
+    https://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
+    https://stackoverflow.com/questions/2617508/cmake-gcc-cuda-and-m32-wtf
-    http://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt
+    https://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt
 OpenBSD
@@ -176,8 +156,16 @@ OpenBSD
  and build normally.
-  See: https://bug.tasktools.org/browse/TW-1579
+  See: https://github.com/GothenburgBitFactory/taskwarrior/issues/1605
 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
 ---------------
@@ -192,8 +180,7 @@ 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@taskwarrior.org, or post a
+and 'CMakeFiles/CMakeOutput.log' files to support@gothenburgbitfactory.org.
 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/7
+++ b/7
@@ -1,6 +1,8 @@
-Taskwarrior - a command line task list manager.
+The MIT License
-Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+https://www.opensource.org/licenses/mit-license.php
 Copyright 2006 - 2021, Tomas Babej, 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 +22,3 @@ 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
--- a/169
+++ b/169
@@ -1,61 +1,152 @@
 New Features in Taskwarrior 2.6.0
-New Features in Taskwarrior 2.5.1
+  - The logic behind new-uuid verbosity option changed. New-uuid now overrides
    new-id if set and will cause Taskwarrior to display UUIDs instead of IDs
    for new tasks (machine friendly).
  - If ~/.taskrc is not found, Taskwarrior will look for its configuration in
    $XDG_CONFIG_HOME/task/taskrc (defaulting to ~/.config/task/taskrc). This
    allows users to setup their Taskwarrior to follow XDG standard without
    using config overrides.
  - Newer Unicode characters, such as emojis are correctly handled and displayed.
    Taskwarrior now supports all Unicode characters up to Unicode 12.
  - Datetime values until year 9999 are now supported.
    Duration values of up to 1 000 000 years are now supported.
  - 64-bit numeric values (up to 9,223,372,036,854,775,807) are now supported.
  - Later/someday named datetime values now resolve to 9999-12-30 (instead of
    2038-01-18).
  - Calendar now supports displaying due dates until year 9999.
  - Calendar now displays waiting tasks with due dates on the calendar.
  - Calendar supports highlighting days with scheduled tasks.
  - Multi-day holidays are now supported.
  - Holiday data files for fr-CA, hu-HU, pt-BR, sk-SK and sv-FI locales are now
    generated and shipped with Taskwarrior.
  - The task edit command can now handle multi-line annotations and UDAs in a
    user friendly way, withouth having to handle with JSON escaping of special
    chars.
  - A large portion of currently known parser-related issues was fixed.
  - The taskrc file now supports relative paths, which are evaluated with
    respect to (a) current directory, (b) taskrc directory and (c) now also the
    installation directory of configuration files.
  - The currently selected context is now applied for "task add" and "task log"
    commands. Section on contexts in the manpage was updated to describe this
    functionality.
  - Users can specify per-context specific overrides of configuration variables.
  - The `task import` command can now accept annotations with missing entry
    values. Current time will be assumed.
  - The new 'by' filter attribute modifier compares using '<=' rather than '<'
    as 'before' uses.  This allows the last second of the day to match with
    'due.by:eod', which it would not otherwise.  It also works with
    whole units like days, e.g. 'add test due:2021-07-17' would not match
    'due.before:tomorrow' (on the 16th), but would match 'due.by:tomorrow'.
  - Waiting is now an entirely "virtual" concept, based on a task's
    'wait' property and the current time. Task is considered "waiting" if its
    wait attribute is in the future. TaskWarrior no longer explicitly
    "unwaits" a task (the wait attribute is not removed once its value is in
    the past), so the "unwait' verbosity token is no longer available.
    This allows for filtering for tasks that were waiting in the past
    intervals, but are not waiting anymore.
  - The configuration file now supports environment variables.
  - Taskwarrior can now handle displaying tasks in windows with limited width,
    even if columns contain long strings (like URLs).
  - The nag message is emitted at most once per task command, even with bulk
    operations. Additionally, the urgency of the task considered is taken
    before the completion, not after.
  - The export command now takes an optional argument that references an
    existing report. As such, "task export <report>" command will export
    the same tasks that "task <report>" prints, and in the same order.
  - The burndown command now supports non-cumulative display, where tasks only
    get plotted within the interval segment when they got completed.
  - 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.
-New Commands in Taskwarrior 2.5.1
+New Commands in Taskwarrior 2.6.0
-  - None.
+  - The 'news' command will guide the user through important release notes
    anytime a new version of Taskwarrior is installed. It provides personalized
    feedback, deprecation warnings and usage advice, where applicable.
-New Configuration Options in Taskwarrior 2.5.1
+New Configuration Options in Taskwarrior 2.6.0
-  - New 'relative' column format for 'date' type columns does what 'remaining'
+  - The context definitions for reporting commmands are now stored in
-    and 'countdown' do, but in one format.
+    "context.<name>.read". Context definitions for write commands are now
    supported using "context.<name>.write" configuration variable.
  - The context-specific configuration overrides are now supported. Use
    context.<name>.rc.<key>=<value> to override, such as
    context.work.rc.urgency.blocking=5.0 to override the value of urgency.blocking
    when the 'work' context is active.
  - Each report (and the timesheet command) can explicitly opt-out from the
    currently active context by setting the report.<name>.context variable to 0
    (defaults to 1). Useful for defining universal reports that ignore
    currently set context, such as 'inbox' report for GTD methodology.
  - Multi-day holidays are now supported. Use holiday.<name>.start=<date> and
    holiday.<name>.end=<date> to specify a range-based holiday, such as a
    vacation.
  - Verbosity token 'default' was introduced in order to display information
    about default actions.
  - The new burndown.cumulative option can be used to toggle between
    non-cumulative and cumulative version of the burndown command.
  - The new color.calendar.scheduled setting can be used to control the
    highlighting color of days in the calendar that have scheduled tasks.
-Newly Deprecated Features in Taskwarrior 2.5.1
+
 Newly Deprecated Features in Taskwarrior 2.6.0
  - The 'PARENT' and 'CHILD' virtual tags are replaced by 'TEMPLATE' and 'INSTANCE'.
  - The 'waiting' status is now deprecated. We recommend using +WAITING virtual tag
    or wait-attribute based filters, such as 'wait.before:eow' instead.
  - The configuration variable 'monthsperline' is deprecated. Please use
    'calendar.monthsperline' instead.
 Fixed regressions in 2.6.0
  - The "end of <date>" named dates ('eod', 'eow', ...) were pointing to the
    first second of the next day, instead of last second of the referenced
    interval. This was a regression introduced in 2.5.2.
  - The "eow" and "eonw" were using a different weekday as a reference. This
    was a regeression introduced in 2.5.2.
  - The rc.verbose=<value> configuration override was applied only if it were
    the first configuration override. In #2247, this manifested itself as
    inability to supress footnotes about the overrides, and in #1953 as failure
    to force task to display UUIDs of on task add. This was a regression
    introduced in 2.5.2.
  - The attribute values of the form "<attribute name>-<arbitrary string>", for
    example "due-nextweek" or "scheduled-work" would fail to parse (see
    #1913). This was a regression introduced in 2.5.1.
  - The capitalized versions of named dates (such as Monday, February or
    Tomorrow) are again supported. This was a regression introduced in 2.5.2.
  - The duration periods are converted to datetime values using the
    current time as the anchor, as opposed to the beginning of unix time.
    This was a regression in 2.5.2.
  - Filtering for attribute values containing dashes and numbers (such as
    'vs.2021-01', see #2392) or spaces (such as "Home renovation", see #2388)
    is again supported. This was a regression introduced in 2.4.0.
 Removed Features in 2.6.0
  -
-Removed Features in 2.5.1
+Other notable changes in 2.6.0
-  - There is no longer a 16-color default configuration for some platforms,
+  - C++17 compatible compiler is now required (GCC 7.1 or older / clang 5.0 or older).
    making all platforms 256-color.
  - The configuration setting 'burndown.bias' is no longer used.
  - The algorithm used to estimate completion on the 'burndown' reports has
    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.
 Known Issues
-  - https://bug.tasktools.org/
+  - https://github.com/GothenburgBitFactory/taskwarrior
-Taskwarrior has been built and tested on the following configurations:
+Taskwarrior 2.6.0 has been built and tested on the following configurations:
-  * OS X
+  * Archlinux
-  * Fedora
+  * OpenSUSE
-  * Ubuntu
+  * macOS 10.15
-  * Debian
+  * Fedora (31, 32, 33, 34)
-  * Arch
+  * Ubuntu (18.04, 20.04, 21.04)
-  * FreeBSD
+  * Debian (Stable, Testing)
-  * Cygwin
+  * CentOS (7, 8)
 However, we expect Taskwarrior to work on other platforms as well.
 ---
 While Taskwarrior has undergone testing, bugs are sure to remain.  If you
 encounter a bug, please enter a new issue at:
-  https://bug.tasktools.org
+  https://github.com/GothenburgBitFactory/taskwarrior
 Or you can also report the issue in the forums at:
  https://answers.tasktools.org
 Or just send a message to:
  support@taskwarrior.org
 Thank you.
--- a/README.md
+++ b/README.md
@@ -1,47 +1,140 @@
-# Disclaimer during ongoing development
+<div align="center">
 <img src="https://avatars.githubusercontent.com/u/36100920?s=200&u=24da05914c20c4ccfe8485310f7b83049407fa9a&v=4"></br>
-We want to discourage you from using the development version of Taskwarrior.
+[![GitHub Actions build status](https://github.com/GothenburgBitFactory/taskwarrior/workflows/tests/badge.svg?branch=develop)](https://github.com/GothenburgBitFactory/taskwarrior/actions)
 [![Release](https://img.shields.io/github/v/release/GothenburgBitFactory/taskwarrior)](https://github.com/GothenburgBitFactory/taskwarrior/releases/latest)
 [![Release date](https://img.shields.io/github/release-date/GothenburgBitFactory/taskwarrior)](https://github.com/GothenburgBitFactory/taskwarrior/releases/latest)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/GothenburgBitFactory?color=green)](https://github.com/sponsors/GothenburgBitFactory/)
 </br>
 [![Twitter](https://img.shields.io/twitter/follow/taskwarrior?style=social)](https://twitter.com/taskwarrior)
 </div>
-The development branch is a work in progress and may not pass all quality tests,
+## Taskwarrior
-therefore it may harm your data. We do not guarantee proper or even adequate
+![OS-X downloads](https://img.shields.io/homebrew/installs/dy/task?label=OS-X%20downloads)
-functionality, performance or timely fixes.
+![Github downloads](https://img.shields.io/github/downloads/GothenburgBitFactory/taskwarrior/total?label=Github%20downloads)
 ![Linux downloads](https://img.shields.io/badge/Linux%20downloads-unknown-gray)
-We welcome bug reports from beta- and release-level software, but generally not
+Taskwarrior is a command line task list management utility with a [multitude of
-development versions. If you are undaunted by this, please:
+features](https://taskwarrior.org/docs/), developed as a portable open source project
 with an active and quite vast [ecosystem of tools, hooks and
 extensions](https://taskwarrior.org/tools/).
- Make proper backups.
+### HEADS UP! 
- Expect broken and missing functionality.
+### This fork is to intended to preserve the taskwarrior 2.6.2 codebase, and to allow for further fixes and improvements!!
- Be aware that using the development branch involves risks.
+It's great to see that taskwarrior is still an active project and the active developers, working on version 3.x, have a vision that fuses taskchampion and an SQL database. It's cool, and in rust, and everything.. but they are decidedly uninterested in further work on the 2.x (data as text files) codebase.
---
+It was the fact that task used a text-file to store data, that first hooked me to the project. I'm almost certainly first taskwarrior user, and technically the original taskwarrior Designer! I worked with the orginal programmer, Paul Beckingham, as he brilliantly implemented so many of my crazy ideas, like colors, urgency, reports, UDAs, attribute modifiers and SO much more! 
-Thank you for taking a look at Taskwarrior!
+Because I'm an old fart, set im my ways like that, and kind of squeamish about keeping my task data as a SQL database, this repo is somewhare I can try to apply fixes and cherry-pick from changes made after official 2.6.2 releases, and to curate some of the things that I think belong with it. That said, I'm a terrible programmer, a dubious developer, and would welcome input, ideas and contributions.
-Taskwarrior is a GTD, todo list, task management, command line utility with a
+## Install
-multitude of features. It is a portable, well supported and very active Open
+[![Arch](https://img.shields.io/archlinux/v/community/x86_64/task)](https://archlinux.org/packages/community/x86_64/task/)
-Source project. Taskwarrior has binary distributions, online documentation,
+[![Debian](https://img.shields.io/debian/v/task/testing)](https://packages.debian.org/search?keywords=task&searchon=names&suite=all&section=all)
-demonstration movies, and you'll find all the details at:
+[![Fedora](https://img.shields.io/fedora/v/task)](https://bodhi.fedoraproject.org/updates/?packages=task)
 [![Homebrew](https://img.shields.io/homebrew/v/task)](https://formulae.brew.sh/formula/task#default)
 [![Ubuntu](https://img.shields.io/ubuntu/v/task)](https://packages.ubuntu.com/search?keywords=task&searchon=names&suite=hirsute&section=all)
-    http://taskwarrior.org
+Taskwarrior is packaged on a wide range of [Linux/Unix systems, Mac OS and
 Windows](https://taskwarrior.org/download/). Check out the latest available
 packages in repositories of your OS distribution of choice [on
 Repology](https://repology.org/project/taskwarrior/versions).
-At the site you'll find online documentation, downloads, news and more.
+Alternatively, you can build Taskwarrior from source.
-Your contributions are especially welcome. Whether it comes in the form of
+## Documentation
 code patches, ideas, discussion, bug reports, encouragement or criticism, your
 input is needed.
-For support options, take a look at:
+The [online documentation](https://taskwarrior.org/docs), downloads, news and
 more are available on our website, [taskwarrior.org](https://taskwarrior.org).
-    http://taskwarrior.org/support
+We also recommend following [@taskwarrior on
 Twitter](https://twitter.com/taskwarrior), where we share info about new
 features, releases and various tips and tricks for new Taskwarrior users.
-Please send your code patches to:
+## Community
 [![Twitter](https://img.shields.io/twitter/follow/taskwarrior?style=social)](https://twitter.com/taskwarrior)
 [![Reddit](https://img.shields.io/reddit/subreddit-subscribers/taskwarrior?style=social)](https://reddit.com/r/taskwarrior/)
 [![Libera.chat](https://img.shields.io/badge/IRC%20libera.chat-online-green)](https://web.libera.chat/#taskwarrior)
 [![Discord](https://img.shields.io/discord/796949983734661191?label=discord)](https://discord.gg/eRXEHk8w62)
 [![Github discussions](https://img.shields.io/github/discussions/GothenburgBitFactory/taskwarrior?label=GitHub%20discussions)](https://github.com/GothenburgBitFactory/taskwarrior/discussions)
-    support@taskwarrior.org
+Taskwarrior has a lively community on many places on the internet.
-Consider joining bug.tasktools.org, answers.tasktools.org and participating in
+Best place to ask questions is our [discussions forum on
-the future of Taskwarrior.
+Github](https://github.com/GothenburgBitFactory/taskwarrior/discussions). For
 other support options, take a look at
 [taskwarrior.org/support](https://taskwarrior.org/support)
---
+For code contributions, please use pull requests, or alternately send your code patches to
 [support@gothenburgbitfactory.org](mailto:support@gothenburgbitfactory.org)
-Taskwarrior is released under the MIT license. For details check the LICENSE
+## Branching Model
-file.
+
 We use the following branching model:
 * `stable` is a branch containing the content of the latest release. Building
  from here is the same as building from the latest tarball, or installing a
  binary package. No development is done on the `stable` branch.
 * `develop` is the current development branch. All work is done here, and upon
  release it will be merged to `stable`. While development branch is not
  stable, we utilize CI to ensure we're at least not merging improvements that
  break existing tests, and hence should be relatively safe. We still recommend
  making backups when using the development branch.
 ## Installing
 There are many binary packages available, but to install from source requires:
 * git
 * cmake
 * make
 * C++ compiler, currently gcc 7.1+ or clang 5.0+ for full C++17 support
 * uuid-dev (was libuuid-dev)
 * GnuTLS (optional, required for sync)
 Download the tarball, and expand it:
    $ curl -O https://taskwarrior.org/download/task-2.6.2.tar.gz
    $ tar xzf task-2.6.2.tar.gz
    $ cd task-2.6.2
 Or clone this repository:
    $ git clone --recursive -b stable https://github.com/GothenburgBitFactory/taskwarrior.git
    $ cd taskwarrior
 Then build:
    $ cmake -DCMAKE_BUILD_TYPE=release .
    ...
    $ make
    ...
    [$ make test]
    ...
    $ sudo make install
 ## Contributing
 [![Contributors](https://img.shields.io/github/contributors/GothenburgBitFactory/taskwarrior)](https://github.com/GothenburgBitFactory/taskwarrior/graphs/contributors)
 [![Milestone progress](https://img.shields.io/github/milestones/progress/GothenburgBitFactory/taskwarrior/26?label=current%20milestone%20issues)](https://github.com/GothenburgBitFactory/taskwarrior/milestone/26)
 [![Good first issus](https://img.shields.io/github/issues/GothenburgBitFactory/taskwarrior/good%20first%20issue)](https://github.com/GothenburgBitFactory/taskwarrior/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
 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.
 ## Sponsoring
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/GothenburgBitFactory?color=green)](https://github.com/sponsors/GothenburgBitFactory/)
 Taskwarrior is a result of work of mostly small group of volunteers, and has been in development since 2006.
 If you are a happy Taskwarrior user, please consider [sponsoring us through
 Github Sponsors](https://github.com/sponsors/GothenburgBitFactory/).
 Every sponsorship matters, as it directly increases the number of hours core
 developers can contribute to the project and makes the project more sustainable.
 ## License
 Taskwarrior is released under the MIT license.
 For details check the [LICENSE](LICENSE) file.
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -17,18 +17,6 @@
 /* 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
@@ -43,6 +31,7 @@
 #cmakedefine FREEBSD
 #cmakedefine OPENBSD
 #cmakedefine NETBSD
 #cmakedefine DRAGONFLY
 #cmakedefine HAIKU
 #cmakedefine SOLARIS
 #cmakedefine KFREEBSD
--- a/cmake/CXXSniffer.cmake
+++ b/cmake/CXXSniffer.cmake
@@ -0,0 +1,41 @@
 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)
  set (_CXX14_FLAGS "-std=gnu++17")
 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 2.8)
+cmake_minimum_required (VERSION 3.0)
 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,33 +3,6 @@
 .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
@@ -249,14 +222,13 @@ 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.due.today' is the highest precedence, and 'color.deleted' is the lowest.
+rule 'color.deleted' has the highest precedence, and 'color.uda.' 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.  Similarly
+meaning 'color.keyword.*', or in other words all the keyword rules.
 for the 'color.tag.*' and 'color.project.*' rules.
-There is also 'color.project.none', 'color.tag.none' and 'color.pri.none' to
+There is also 'color.project.none', 'color.tag.none' and
-specifically represent missing data.
+'color.uda.priority.none' to specifically represent missing data.
 .SH THEMES
 Taskwarrior supports themes.  What this really means is that with the ability to
@@ -264,11 +236,10 @@ include other files into the .taskrc file, different sets of color rules can
 be included.
 To get a good idea of what a color theme looks like, try adding this entry to
-your .taskrc file (note that your installation may use a slightly different path
+your .taskrc file:
 from the example):
 .RS
-include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-256.theme
+include dark-256.theme
 .RE
 You can use any of the standard Taskwarrior themes:
@@ -313,34 +284,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 <http://taskwarrior.org>.
+on <https://taskwarrior.org>.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2021 T. Babej, P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
-http://www.opensource.org/licenses/mit-license.php for more information.
+https://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, the following may be referenced:
+For more information regarding Taskwarrior, see the following:
 .TP
 The official site at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
 .TP
 The official code repository at
-<https://git.tasktools.org/scm/tm/task.git>
+<https://github.com/GothenburgBitFactory/taskwarrior>
 .TP
-You can contact the project by writing an email to
+You can contact the project by emailing
-<support@taskwarrior.org>
+<support@GothenburgBitFactory.org>
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<http://taskwarrior.org>
+<https://github.com/GothenburgBitFactory/taskwarrior/issues>
--- 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, external and internal.  If you wish to
+Taskwarrior has several sync options, both external and built in.  If you wish
-sync your data, choose one method only; mixing methods is only going to lead to
+to sync your data, choose one method only; mixing methods is going to lead to
 problems.  Each of the methods discussed have their own strengths.
 .SH ALTERNATIVES
@@ -14,14 +14,15 @@ There are three alternatives for syncing data, which are:
 1) Version control systems, such as git, hg, svn
 .br
-2) File hosting systems, such as DropBox
+2) File sharing systems, such as DropBox, Google Drive
 .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 ...), and they function in a similar fashion for our purposes.
+VCS systems (svn, cvs ...), and they all function in a similar fashion for our
 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
@@ -44,8 +45,8 @@ Weaknesses:
  - You need to provide the mechanism for making sure copies are up to date
-.SH OPTION 2: FILE HOSTING SERVICES
+.SH OPTION 2: FILE SHARING SERVICES
-There are many file hosting services, such as DropBox, Amazon S3, Google Drive,
+There are many file sharing 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.
@@ -61,8 +62,6 @@ configuration variable like this:
    $ task config data.location /path/to/shared/directory
 Strengths:
 .br
  - Always secure
 .br
  - Good client support
 .br
@@ -76,7 +75,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.
@@ -86,7 +85,7 @@ done on demand.
 Setup is a matter of creating an account on a Taskserver (see your Taskserver
 provider or operate your own - see
-http://taskwarrior.org/docs/server_setup.html)
+https://taskwarrior.org/docs/taskserver/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:
@@ -107,16 +106,10 @@ 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 initialize
+    $ task sync init
 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
@@ -130,9 +123,20 @@ 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
-  - Always secure
+  - Secure communication
 .br
  - Minimal bandwidth
 .br
@@ -143,31 +147,31 @@ Weaknesses:
  - You need to manage your own server, or gain access to a hosted server.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2021 T. Babej, P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
-http://www.opensource.org/licenses/mit-license.php for more information.
+https://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 task, the following may be referenced:
+For more information regarding Taskwarrior, see the following:
 .TP
 The official site at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
 .TP
 The official code repository at
-<https://git.tasktools.org/scm/tm/task.git>
+<https://github.com/GothenburgBitFactory/taskwarrior>
 .TP
-You can contact the project by writing an email to
+You can contact the project by emailing
-<support@taskwarrior.org>
+<support@GothenburgBitFactory.org>
 .SH REPORTING BUGS
 .TP
-Bugs in task may be reported to the issue-tracker at
+Bugs in Taskwarrior may be reported to the issue-tracker at
-<http://taskwarrior.org>
+<https://github.com/GothenburgBitFactory/taskwarrior/issues>
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -55,6 +55,7 @@ More filter examples:
  task                                      <command> <mods>
  task 28                                   <command> <mods>
  task +weekend                             <command> <mods>
  task +bills due.by:eom                    <command> <mods>
  task project:Home due.before:today        <command> <mods>
  task ebeeab00-ccf8-464b-8b58-f7f2d606edfb <command> <mods>
@@ -75,6 +76,10 @@ UUID numbers or ID ranges):
  task 1 2-5 19                                 modify pri:H
  task 4-7 ebeeab00-ccf8-464b-8b58-f7f2d606edfb info
 Note that it may be necessary to properly escape special characters as well as
 quotes in order to avoid their special meanings in the shell. See also the
 section 'SPECIFYING DESCRIPTIONS' for more information.
 .SH MODIFICATIONS
 The <mods> consist of zero or more changes to apply to the selected tasks, such
@@ -93,7 +98,10 @@ write commands, miscellaneous commands and script helper commands.  Read
 commands do not allow modification of tasks.  Write commands can alter almost
 any aspect of a task.  Script helper commands are provided to help you write
 add-on scripts, for example, shell completion (only minimal output is
-generated, as with verbose=nothing).
+generated, as with verbose=nothing). Those commands which are explicitly affected
 by the
 .I context
 are denoted as such.
 .SH READ SUBCOMMANDS
@@ -130,16 +138,16 @@ Shows all tasks matching the filter, that block other tasks.
 .TP
 .B task <filter> burndown.daily
-Shows a graphical burndown chart, by day.
+Shows a graphical burndown chart, by day. Is affected by the context.
 .TP
 .B task <filter> burndown.weekly
 Shows a graphical burndown chart, by week.  Note that 'burndown' is an alias to
-the 'burndown.weekly' report.
+the 'burndown.weekly' report. Is affected by the context.
 .TP
 .B task <filter> burndown.monthly
-Shows a graphical burndown chart, by month.
+Shows a graphical burndown chart, by month. Is affected by the context.
 .TP
 .B task calendar [due|<month> <year>|<year>] [y]
@@ -151,12 +159,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.
@@ -171,14 +179,14 @@ Shows all tasks matching the filter that are completed.
 .TP
 .B task <filter> count
-Displays only a count of tasks matching the filter.
+Displays only a count of tasks matching the filter. Is affected by the context.
 .TP
 .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. The standard task release comes with a few example scripts,
+another format. You'll find these example scripts online at
-such as:
+<https://taskwarrior.org/tools/>:
  export-csv.pl
  export-sql.py
@@ -200,18 +208,34 @@ 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.
 .TP
 .B task <filter> history.annual
-Shows a report of task history by year.
+Shows a report of task history by year. Is affected by the context.
 .TP
 .B task <filter> history.monthly
 Shows a report of task history by month.  Note that 'history' is
-an alias to 'history.monthly'.
+an alias to 'history.monthly'. Is affected by the context.
 .TP
 .B task <filter> history.weekly
 Shows a report of task history by week. Is affected by the context.
 .TP
 .B task <filter> history.daily
 Shows a report of task history by day. Is affected by the context.
 .TP
 .B task <filter> ids
@@ -231,9 +255,8 @@ 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
+then extracts only the task UUIDs and presents them as a space-separated list.
-a comma-separated list.  This is useful as input to a task command, to achieve
+This is useful as input to a task command, to achieve this:
 this:
  task $(task project:Home status:completed uuids) modify status:pending
@@ -279,9 +302,9 @@ value.
 .TP
 .B task <filter> ready
-Shows a page of the most urgent ready tasks, sorted by urgency.  A ready task is
+Shows a page of the most urgent ready tasks, sorted by urgency with started
-one that is either unscheduled, or has a scheduled date that is past and has no
+tasks first. A ready task is one that is either unscheduled, or has a scheduled
-wait date.
+date that is past and is not waiting.
 .TP
 .B task <filter> oldest
@@ -294,7 +317,7 @@ Shows all incomplete tasks matching the filter that are beyond their due date.
 .TP
 .B task <filter> projects
 Lists all project names that are currently used by pending tasks, and the
-number of tasks for each.
+number of tasks for each. Is affected by the context.
 .TP
 .B task <filter> recurring
@@ -313,7 +336,8 @@ Shows all waiting tasks matching the filter.
 .TP
 .B task add <mods>
-Adds a new pending task to the task list.
+Adds a new pending task to the task list. It is affected by the currently set
 context.
 .TP
 .B task <filter> annotate <mods>
@@ -325,28 +349,28 @@ Appends description text to an existing task.
 .TP
 .B task <filter> delete <mods>
-Deletes the specified task from task list.
+Deletes the specified task from task list. Is affected by the context.
 .TP
 .B task <filter> denotate <mods>
 Deletes an annotation for the specified task. If the provided description
 matches an annotation exactly, the corresponding annotation is deleted. If the
 provided description matches annotations partly, the first partly matched
-annotation is deleted.
+annotation is deleted. Is affected by the context.
 .TP
 .B task <filter> done <mods>
-Marks the specified task as done.
+Marks the specified task as done. Is affected by the context.
 .TP
 .B task <filter> duplicate <mods>
-Duplicates the specified task and allows modifications.
+Duplicates the specified task and allows modifications. Is affected by the context.
 .TP
 .B task <filter> edit
 Launches a text editor to let you modify all aspects of a task directly.
 In general, this is not the recommended method of modifying tasks, but is
-provided for exceptional circumstances.  Use carefully.
+provided for exceptional circumstances.  Use carefully. Is affected by the context.
 .TP
 .B task import [<file> ...]
@@ -366,7 +390,8 @@ few example scripts, such as:
 .TP
 .B task log <mods>
-Adds a new task that is already completed, to the task list.
+Adds a new task that is already completed, to the task list. It is affected by
 the currently set context.
 .TP
 .B task <filter> modify <mods>
@@ -374,17 +399,26 @@ Modifies the existing task with provided information.
 .TP
 .B task <filter> prepend <mods>
-Prepends description text to an existing task.
+Prepends description text to an existing task. Is affected by the context.
 .TP
 .B task <filter> purge
 Permanently removes the specified tasks from the data files. Only
 tasks that are already deleted can be purged. This command has a
 local-only effect and changes introduced by it are not synced.
 Is affected by the context.
 Warning: causes permanent, non-revertible loss of data.
 .TP
 .B task <filter> start <mods>
-Marks the specified tasks as started.
+Marks the specified tasks as started. Is affected by the context.
 .TP
 .B task <filter> stop <mods>
 Removes the
 .I start
-time from the specified task.
+time from the specified task. Is affected by the context.
 .SH MISCELLANEOUS SUBCOMMANDS
@@ -408,7 +442,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':
@@ -487,34 +521,59 @@ conjunction with aliases and extensions can provide seamless integration.
 .B task logo
 Displays the Taskwarrior logo.
 .TP
 .B task news
 Guides the user through important release notes anytime a new version of
 Taskwarrior is installed. It provides personalized feedback, deprecation
 warnings and usage advice, where applicable.
 .TP
 .B task reports
 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.
 .TP
 .B task <filter> stats
-Shows statistics of the tasks defined by the filter.
+Shows statistics of the tasks defined by the filter. Is affected by the context.
 .TP
 .B task <filter> summary
-Shows a report of aggregated task status by project.
+Shows a report of aggregated task status by project. Is affected by the context.
 .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
 virtual tags are not listed - they don't really exist, and are just a convenient
 notation for other task metadata. It is an error to attempt to add or remove a
-virtual tag.
+virtual tag. Is affected by the context.
 .TP
-.B task timesheet [weeks]
+.B task timesheet [<weeks>]
 Shows a weekly report of tasks completed and started.
 .TP
@@ -562,7 +621,7 @@ by third-party applications.
 Reports a unique set of attribute values. For example, to see all the active
 projects:
-  task +PENDING _unique projects
+  task +PENDING _unique project
 .TP
 .B task <filter> _uuids
@@ -610,10 +669,16 @@ Accesses and displays the DOM reference(s).  Used to extract individual values
 from tasks, or the system.  Supported DOM references are:
  rc.<name>
-  context.program
+  tw.syncneeded
-  context.args
+  tw.program
-  context.width
+  tw.args
-  context.height
+  tw.width
  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>
@@ -633,7 +698,7 @@ extracted by DOM references.
 For a full list of supported attribute-specific DOM references, consult
 the online documentation at:
-<http://taskwarrior.org/docs/dom.html>
+<https://taskwarrior.org/docs/dom.html>
 .SH ATTRIBUTES AND METADATA
@@ -670,22 +735,24 @@ are:
    ANNOTATED    Matches if the task has annotations
    BLOCKED      Matches if the task is blocked
    BLOCKING     Matches if the task is blocking
-    CHILD        Matches if the task has a parent
+    CHILD        Matches if the task has a parent (deprecated in 2.6.0)
    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
+    INSTANCE     Matches if the task is a recurrent instance
    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
    OVERDUE      Matches if the task is overdue
-    PARENT       Matches if the task is a parent
+    PARENT       Matches if the task is a parent (deprecated in 2.6.0)
    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
    TEMPLATE     Matches if the task is a recurrence template
    TODAY        Matches if the task is due today
    TOMORROW     Matches if the task is due sometime tomorrow
    UDA          Matches if the task has any UDA values
@@ -735,9 +802,10 @@ to 25 lines.
 .TP
 .B wait:<wait-date>
-When a task is given a wait date, it is hidden from most reports by changing
+When a task is given a wait date, it is hidden from most built-in reports, which
-its status to 'waiting'. When that date is passed, the status is changed back
+exclude +WAITING.  When the date is in the past, the task is not considered +WAITING,
-to 'pending', and the task becomes visible.
+and again becomes visible.  Note that, for compatibilty, such tasks are shown as
 having status "waiting", but this will change in a future release.
 .TP
 .B depends:<id1,id2 ...>
@@ -759,6 +827,8 @@ Attribute modifiers improve filters.  Supported modifiers are:
 .br
 .B  after      (synonyms over, above)
 .br
 .B  by
 .br
 .B  none
 .br
 .B  any
@@ -780,6 +850,13 @@ 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
@@ -799,6 +876,24 @@ modifier is the inverse of the
 .I before
 modifier.
 The
 .I by
 modifier is the same as 'before', except it also includes the moment in
 question.  For example:
    task add test due:eoy
 will be found when using the inclusive filter 'by':
    task due.by:eoy
 but not when the non-inclusive filter 'before' is used:
    task due.before:eoy
 this applies equally to other named dates such as 'eom', 'eod', etc; the
 modifier compares using '<=' rather than '<' like 'before' does.
 The
 .I none
 modifier requires that the attribute does not have a value.  For example:
@@ -1019,7 +1114,7 @@ task ... wait:later
 .br
 task ... wait:someday
-This sets the wait date to 1/18/2038.
+This sets the wait date to 12/30/9999.
 .TP
 Next occurring weekday
@@ -1040,6 +1135,8 @@ task ... due:pentecost
 task ... due:midsommar
 .br
 task ... due:midsommarafton
 .br
 task ... due:juhannus
 .RE
 .SS FREQUENCIES
@@ -1086,9 +1183,31 @@ Every two years.
 .RE
 .SH CONTEXT
-Context is a user-defined filter, which is automatically applied to all commands
+Context is a user-defined query, which is automatically applied to all commands
-that filter the task list. In particular, any report command will have its
+that filter the task list and to commands that create new tasks (add, log). For
-result affected by the current active context.
+example, any report command will have its result affected by the current
 active context.  Here is a list of the commands that are affected:
 .IP
    add
    burndown
    count
    delete
    denotate
    done
    duplicate
    edit
    history
    log
    prepend
    projects
    purge
    start
    stats
    stop
    summary
    tags
 All other commands are NOT affected by the context.
    $ task list
    ID Age Project  Description        Urg
@@ -1103,6 +1222,21 @@ result affected by the current active context.
    2  1d  Home     Clean the dishes   1.14
    Context 'home' set. Use 'task context none' to remove.
 Task list got automatically filtered for project:Home.
    $ task add Vaccuum the carpet
    Created task 3.
    Context 'home' set. Use 'task context none' to remove.
    $ task list
    ID Age Project  Description         Urg
    2  1d  Home     Clean the dishes    1.14
    3  5s  Home     Vaccuum the carpet  1.14
    Context 'home' set. Use 'task context none' to remove.
 Note that the newly added task "Vaccuum the carpet" has "project:Home" set
 automatically.
 As seen in the example above, context is applied by specifying its name to the
 "context" command. To change the currently applied context, just pass the
 new context's name to the 'context' command.
@@ -1113,37 +1247,92 @@ To unset any context, use the 'none' subcommand.
    Context unset.
    $ task list
-    ID Age Project  Description        Urg
+    ID Age Project  Description         Urg
-    1  2d  Sport    Run 5 miles        1.42
+    1  2d  Sport    Run 5 miles         1.42
-    2  1d  Home     Clean the dishes   1.14
+    2  1d  Home     Clean the dishes    1.14
    3  7s  Home     Vaccuum the carpet  1.14
 Context can be defined using the 'define' subcommand, specifying both the name
 of the new context, and it's assigned filter.
    $ task context define home project:Home
-    Are you sure you want to add 'context.home' with a value of 'project:Home'? (yes/no) yes
+    Are you sure you want to add 'context.home.read' with a value of 'project:Home'? (yes/no) yes
    Are you sure you want to add 'context.home.write' with a value of 'project:Home'? (yes/no) yes
    Context 'home' successfully defined.
 Note that you were separately prompted to set the 'read' and 'write' context.
 This allows you to specify contexts that only work for reporting commands or
 only for commands that create tasks.
 To remove the definition, use the 'delete' subcommand.
    $ task context delete home
-    Are you sure you want to remove 'context.home'? (yes/no) yes
+    Are you sure you want to remove 'context.home.read'? (yes/no) yes
-    Context 'home' successfully undefined.
+    Are you sure you want to remove 'context.home.write'? (yes/no) yes
    Context 'home' deleted.
 To check what is the currently active context, use the 'show' subcommand.
    $ task context show
-    Context 'home' with filter 'project:Home' is currently applied.
+    Context 'home' with
    * read filter: '+home'
    * write filter: '+home'
    is currently applied.
 Contexts can store arbitrarily complex filters.
    $ task context define family project:Family or +paul or +nancy
-    Are you sure you want to add 'context.home' with a value of 'project:Family or +paul or +nancy'? (yes/no) yes
+    Are you sure you want to add 'context.family.read' with a value of 'project:Family or +paul or +nancy'? (yes/no) yes
    Are you sure you want to add 'context.family.write' with a value of 'project:Family or +paul or +nancy'? (yes/no) no
    Context 'family' successfully defined.
 Contexts are permanent, and the currently set context name is stored in the
 "context" configuration variable. The context definition is stored in the
-"context.<name>" configuration variable.
+"context.<name>.read" configuration variable (for reporting commands) and
 "context.<name>.write" configuration variable (for task additions, i.e. task
 add/log).
 Note that in the example above, the user decided not to define the complex
 filter as writeable context. The reason for this decision is that the complex
 filter in the example does not directly translate to a modification. In fact,
 if such a context is used as a writeable context, the following happens:
    $ task add Call Paul
    Created task 4.
    Context 'family' set. Use 'task context none' to remove.
    $ task 4 list
    ID Age  Project Tags       Description      Urg
     4 9min Family  nancy paul or or Call Paul    0
 There is no clear mapping between the complex filter used and the modifications
 (should only the project be set? only the tags? both?). Additionally note the 'or'
 operators being present in the description. Taskwarrior does not try to guess
 the user intention here, and instead, the user is expected to set the
 "context.<name>.write" variable to make their intention explicit, for example:
    $ task config context.family.write project:Family
    Are you sure you want to change the value of 'context.family.write' from 'project:Family or +paul or +nancy' to 'project:Family'? (yes/no) yes
    Config file /home/tbabej/.config/task/taskrc modified.
    $ task context
    Name   Type  Definition                        Active
    family read  project:Family or +paul or +nancy yes
           write project:Family                    yes
    home   read  +home                             no
           write +home                             no
 Note how read and write contexts differ for context "family", while for context
 "home" they stay the same.
 In addition, every configuration parameter can be overridden for the current
 context, by specifying context.<name>.rc.<parameter>. For example, if the default
 command for the family context should be displaying the family_report:
    $ task config context.family.rc.default.command family_report
 .SH COMMAND ABBREVIATION
 All Taskwarrior commands may be abbreviated as long as a unique prefix is used,
@@ -1221,12 +1410,15 @@ Taskwarrior stores its configuration in a file in the user's home directory:
 .TP
 .B task rc:<path-to-alternate-file> ...
-Specifies an alternate configuration file.
+Specifies an alternate configuration file with highest priority.
 .TP
-.B TASKRC=/tmp/.taskrc task ..
+.B TASKRC=<path-to-alternate-file> task ..
-The environment variable overrides the default and the command line
+The environment variable specifies an alternate configuration file to use.
-specification of the .taskrc file.
+
 .TP
 .B XDG_CONFIG_HOME=<path-to-alternate-config-home> task ..
 The environment variable specifies an alternate configuration file to use.
 .TP
 .B task rc.<name>:<value> ...
@@ -1235,15 +1427,15 @@ Specifies individual configuration file overrides.
 .TP
 .B TASKDATA=/tmp/.task task ...
-The environment variable overrides the default, the command line, and
+The environment variable overrides the default, and the 'data.location'
-the 'data.location' configuration setting of the task data directory.
+configuration setting of the task data directory.
 .SH MORE EXAMPLES
 For examples please see the online documentation starting at
 .RS
-<http://taskwarrior.org/docs>
+<https://taskwarrior.org/docs>
 .RE
 Note that the online documentation can be more detailed and more current than
@@ -1254,7 +1446,10 @@ this man page.
 .TP
 ~/.taskrc
 User configuration file - see also taskrc(5).  Note that this can be
-overridden on the command line or by the TASKRC environment variable.
+overridden on the command line or by the TASKRC environment variable. Also, if
 .I ~/.taskrc
 doesn't exist and XDG_CONFIG_HOME environment variable is defined, taskwarrior
 will check if $XDG_CONFIG_HOME/task/taskrc exists and attempt to read it
 .TP
 ~/.task
@@ -1275,10 +1470,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 \- 2016 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2021 T. Babej, P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
-http://www.opensource.org/licenses/mit-license.php for more information.
+https://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR taskrc(5),
@@ -1289,18 +1484,17 @@ For more information regarding Taskwarrior, see the following:
 .TP
 The official site at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
 .TP
 The official code repository at
-<https://git.tasktools.org/scm/tm/task.git>
+<https://github.com/GothenburgBitFactory/taskwarrior>
 .TP
 You can contact the project by emailing
-<support@taskwarrior.org>
+<support@GothenburgBitFactory.org>
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<https://bug.tasktools.org/>
+<https://github.com/GothenburgBitFactory/taskwarrior/issues>
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -9,6 +9,8 @@ taskrc \- Configuration details for the task(1) command
 .B task rc:<directory-path>/.taskrc ...
 .br
 .B TASKRC=<directory-path>/.taskrc task ...
 .br
 .B XDG_CONFIG_HOME=<directory-path>/task/taskrc task ...
 .SH DESCRIPTION
 .B Taskwarrior
@@ -34,6 +36,12 @@ or using the TASKRC environment variable:
 $ TASKRC=/tmp/.taskrc task ...
 .RE
 Additionally, if no ~/.taskrc exists, taskwarrior will check if the XDG_CONFIG_HOME environment variable is defined:
 .RS
 $ XDG_CONFIG_HOME=~/.config task ...
 .RE
 Individual options can be overridden by using the
 .I rc.<name>:
 attribute when running task:
@@ -55,7 +63,7 @@ default, sample
 .I .taskrc
 file in the user's home directory.
-The .taskrc file follows a very simply syntax defining name/value pairs:
+The .taskrc file follows a very simple syntax defining name/value pairs:
 .RS
 <name> = <value>
@@ -68,8 +76,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 "on", "yes", "y", "1" and "true".
+items. You can use "1" to enable, anything else is interpreted as disabled.
-Anything else means "off".
+The values "on", "yes", "y" and "true" are currently supported but deprecated.
 .RS
 include <file>
@@ -77,8 +85,15 @@ include <file>
 There may be whitespace around 'include' and <file>. The file may be an
 absolute or relative path, and the special character '~' is expanded to mean
-$HOME.
+$HOME. If relative path is specified, the it will be evaluated as relative with
-The entry must be on a single line, no continuations.
+respect to the following directories (listed in order of precedence):
 1. the current working directory
 2. the directory containing the taskrc file
 3. the directories set by the package manager (which usually contain
   pre-defined themes)
 Note that environment variables are also expanded in paths (and any other
 taskrc variables).
 .RS
 # <comment>
@@ -144,9 +159,9 @@ ones containing just the relevant configuration data like colors, etc.
 There are two excellent uses of includes in your .taskrc, shown here:
 .RS
-include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc
+include holidays.en-US.rc
 .br
-include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-16.theme
+include dark-16.theme
 .RE
 This includes two standard files that are distributed with Taskwarrior, which
@@ -154,7 +169,7 @@ define a set of US holidays, and set up a 16-color theme to use, to color the
 reports and calendar.
 .SH ENVIRONMENT VARIABLES
-These environment variables override defaults and command line arguments.
+These environment variables override defaults, but not command-line arguments.
 .TP
 .B TASKDATA=~/.task
@@ -163,6 +178,17 @@ This overrides the default path for the Taskwarrior data files.
 .TP
 .B TASKRC=~/.taskrc
 This overrides the default RC file.
 .RE
 This environment variable will be checked if
 .I ~/.taskrc
 doesn't exist
 .TP
 .B XDG_CONFIG_HOME=~/.config
 If set, taskwarrior will look for a
 .I $XDG_CONFIG_HOME/task/taskrc
 file
 .SH CONFIGURATION VARIABLES
 Valid variable names and their default values are:
@@ -181,33 +207,37 @@ shell meta character, which will be properly expanded.
 Note that the TASKDATA environment variable overrides this setting.
 .TP
-.B locking=on
+.B hooks.location=$HOME/.task/hooks
 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 "on". Solaris users who store the data
+completed.data files. Defaults to "1". Solaris users who store the data
-files on an NFS mount may need to set locking to "off". Note that there is
+files on an NFS mount may need to set locking to "0". Note that there is
-danger in setting this value to "off" - another program (or another instance of
+danger in setting this value to "0" - another program (or another instance of
 task) may write to the task.pending file at the same time.
 .TP
-.B gc=on
+.B gc=1
 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=off ...), and not permanently used in the .taskrc file,
+override (task rc.gc=0 ...), and not permanently used in the .taskrc file,
 as this significantly affects performance in the long term.
 .TP
-.B hooks=on
+.B hooks=1
 This master control switch enables hook script processing. The default value
-is 'on', but certain extensions and environments may need to disable hooks.
+is '1', but certain extensions and environments may need to disable hooks.
 .TP
-.B exit.on.missing.db=no
+.B exit.on.missing.db=0
-When set to 'yes' causes the program to exit if the database (~/.task or
+When set to '1' causes the program to exit if the database (~/.task or
-rc.data.location or TASKDATA override) is missing. Default value is 'no'.
+rc.data.location or TASKDATA override) is missing. Default value is '0'.
 .SS TERMINAL
 .TP
-.B detection=on
+.B detection=1
 Determines whether to use ioctl to establish the size of the window you are
 using, for text wrapping.
@@ -225,14 +255,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=no
+.B avoidlastcolumn=0
 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 'no'.
+Cygwin users. Default value is '0'.
 .TP
-.B hyphenate=on
+.B hyphenate=1
-Hyphenates lines when wrapping breaks occur mid-word. Default value is 'on'.
+Hyphenates lines when wrapping breaks occur mid-word. Default value is '1'.
 .TP
 .B editor=vi
@@ -250,9 +280,9 @@ prompt. This is only referenced when 'limit:page' is used.
 .SS MISCELLANEOUS
 .TP
-.B verbose=on|off|nothing|list...
+.B verbose=1|0|nothing|list...
-When set to "on" (the default), helpful explanatory comments are added to all
+When set to "1" (the default), helpful explanatory comments are added to all
-output from Taskwarrior. Setting this to "off" means that you would see regular
+output from Taskwarrior. Setting this to "0" means that you would see regular
 output.
 The special value "nothing" can be used to eliminate all optional output, which
@@ -263,32 +293,36 @@ 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
+    header     Messages that appear before report output (this includes .taskrc/.task overrides and the "[task next]" message)
-    footnote   Messages that appear after report output
+    footnote   Messages that appear after report output (mostly status messages and change descriptions)
    label      Column labels on tabular reports
-    new-id     Provides feedback of any new task IDs
+    new-id     Provides feedback on any new task with IDs (and UUIDs for new tasks with ID 0, such as new completed tasks).
-    new-uuid   Provides feedback of any new task UUIDs. Deprecated, to be
+    new-uuid   Provides feedback on any new task with UUIDs. Overrides new-id. Useful for automation.
               merged with new-id.
    affected   Reports 'N tasks affected' and similar
    edit       Used the verbose template for the 'edit' command
    special    Feedback when applying special tags
    project    Feedback about project status changes
    sync       Feedback about sync
    filter     Shows the filter used in the command
-    unwait     Notification when a task leaves the 'waiting' state
+    context    Show the current context. Displayed in footnote.
    override   Notification when configuration options are overridden
    recur      Notification when a new recurring task instance is created
    default    Notifications about taskwarrior choosing to perform a default action.
-"affected", "new-id", "new-uuid" "project" and "unwait" imply "footnote".
+The tokens "affected", "new-id", "new-uuid", "project", "override" and "recur"
 imply "footnote".
-Note that the "on" setting is equivalent to all the tokens being specified,
+The token "default" implies "header".
 Note that the "1" 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
+    verbose=blank,header,footnote,label,new-id,affected,edit,special,project,sync,filter,override,recur
-    verbose=off
+    verbose=0
    verbose=blank,label,new-id,edit
    verbose=nothing
@@ -298,16 +332,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=yes
+.B confirmation=1
-May be "yes" or "no", and determines whether Taskwarrior will ask for
+May be "1" or "0", and determines whether Taskwarrior will ask for
 confirmation before deleting a task or performing the undo command. The default
-value is "yes". Consider leaving this setting as "yes", for safety.
+value is "1". Consider leaving this enabled, for safety.
 .TP
-.B allow.empty.filter=yes
+.B allow.empty.filter=1
 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 'no' means that it is an error to use a write command with no
+Setting this to '0' means that it is an error to use a write command with no
 filter.
 .TP
@@ -344,47 +378,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=no
+.B list.all.projects=0
-May be yes or no, and determines whether the 'projects' command lists all the project
+May be "1" or "0", 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
-"no".
+"0".
 .TP
-.B summary.all.projects=no
+.B summary.all.projects=0
-If set to yes, shows all projects in the summary report, even if there are no
+If set to "1", shows all projects in the summary report, even if there are no
-pending tasks.  The default value is "no".
+pending tasks.  The default value is "0".
 .TP
-.B complete.all.tags=yes
+.B complete.all.tags=1
-May be yes or no, and determines whether the tab completion scripts consider all
+May be "1" or "0", 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 "no".
+value is "0".
 .TP
-.B list.all.tags=yes
+.B list.all.tags=1
-May be yes or no, and determines whether the 'tags' command lists all the tag
+May be "1" or "0", 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
-"no".
+"0".
 .TP
-.B print.empty.columns=no
+.B print.empty.columns=1
-May be yes or no, and determines whether columns with no data for any task are
+May be "1" or "0", and determines whether columns with no data for any task are
-printed. Defaults to no.
+printed. Defaults to "0".
 .TP
-.B search.case.sensitive=yes
+.B search.case.sensitive=1
-May be yes or no, and determines whether keyword lookup and substitutions on the
+May be "1" or "0", and determines whether keyword lookup and substitutions on the
-description and annotations are done in a case sensitive way. Defaults to yes on
+description and annotations are done in a case sensitive way. Defaults to "1" on
-most platforms. Defaults to no on Cygwin due to older regex library problems with
+most platforms. Defaults to "0" on Cygwin due to older regex library problems with
 case-insensitivity.
 .TP
-.B regex=on
+.B regex=1
-Controls whether regular expression support is enabled. The default value is on.
+Controls whether regular expression support is enabled. The default value is "1".
 .TP
-.B xterm.title=no
+.B xterm.title=1
-Sets the xterm window title when reports are run. Defaults to off.
+Sets the xterm window title when reports are run. Defaults to "0".
 .TP
 .B expressions=infix|postfix
@@ -392,21 +426,15 @@ Sets a preference for infix expressions (1 + 2) or postfix expressions (1 2 +).
 Defaults to infix.
 .TP
-.B json.array=on
+.B json.array=1
 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=off, export writes raw JSON objects to STDOUT, one per line.
+With json.array=0, export writes raw JSON objects to STDOUT, one per line.
-Defaults to on.
+Defaults to "1".
 .TP
-.B json.depends.array=on
+.B _forcecolor=1
 Determines whether the export command encodes dependencies as an array of string
 UUIDs, or one comma-separated string.
 Defaults to on.
 .TP
 .B _forcecolor=no
 Taskwarrior shuts off color automatically when the output is not sent directly
 to a TTY. For example, this command:
@@ -422,6 +450,8 @@ $ 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 *.
@@ -432,16 +462,20 @@ The character or string to show in the tag.indicator column. Defaults to +.
 .TP
 .B dependency.indicator=D
-The character or string to show in the depends.indicator column. Defaults to +.
+The character or string to show in the depends.indicator column. Defaults to D.
 .TP
 .B uda.<name>.indicator=U
 The character or string to show in the <uda>.indicator column. Defaults to U.
 .TP
-.B recurrence=yes
+.B recurrence=1
 Controls whether recurrence is enabled, and whether recurring tasks continue to
-generate new task instances. Defaults to 'yes'.
+generate new task instances. Defaults to "1".
 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
@@ -475,7 +509,7 @@ Minimum length of any abbreviated command/value. This means that "ve", "ver",
 Default is 2.
 .TP
-.B debug=off
+.B debug=0
 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
@@ -483,7 +517,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.
+if they do not already have assigned values. Defaults to "0".
 .TP
 .B debug.hooks=0
@@ -503,7 +537,7 @@ Controls the GnuTLS diagnostic level. For 'sync' debugging. Level 0 means no
 diagnostics. Level 9 is the highest. Level 2 is a good setting for debugging.
 .TP
-.B obfuscate=1
+.B obfuscate=0
 When set to '1', will replace all report text with 'xxx'.
 This is useful for sharing report output in bug reports.
 Default value is '0'.
@@ -515,6 +549,12 @@ Taskwarrior supports command aliases. This alias provides an alternate name
 any of the commands. Several commands you may use are actually aliases -
 the 'history' report, for example, or 'export'.
 .TP
 .B burndown.cumulative=1
 May be "1" or "0", and controls the behaviour of the burndown command. When set
 to 1, it sums up all completed tasks, otherwise they only get plotted in the
 interval where the task was completed. Defaults to 1.
 .SS DATES
 .TP
@@ -583,6 +623,8 @@ 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
@@ -645,8 +687,10 @@ field that is set. Otherwise, they are set to the corresponding values of
 .RE
 .TP
-.B date.iso=yes
+.B date.iso=1
-Enables ISO-8601 date support.  The default value is "yes".
+Enables ISO-8601 date support.  The default value is "1".
 .SS CALENDAR
 .TP
 .B weekstart=Sunday
@@ -654,10 +698,10 @@ Determines the day a week starts. Valid values are Sunday or Monday only. The
 default value is "Sunday".
 .TP
-.B displayweeknumber=yes
+.B displayweeknumber=1
 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
-"yes".
+"1".
 .TP
 .B due=7
@@ -666,11 +710,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
@@ -679,9 +723,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=off
+.B calendar.offset=0
-If "on" the first month in the calendar report is effectively changed by the
+If "1" the first month in the calendar report is effectively changed by the
-offset value specified in calendar.offset.value. It defaults to "off".
+offset value specified in calendar.offset.value. It defaults to "0".
 .TP
 .B calendar.offset.value=-1
@@ -689,7 +733,7 @@ The offset value to apply to the first month in the calendar report. The default
 value is "-1".
 .TP
-.B calendar.holidays=full
+.B calendar.holidays=none
 If set to full running "task calendar" will display holidays in the calendar by
 color-coding the corresponding days. A detailed list with the dates and names
 of the holidays is also shown. If set to sparse only the days are color-coded
@@ -697,15 +741,21 @@ 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=yes
+.B calendar.legend=1
-Determines whether the calendar legend is displayed. The default value is "yes".
+Determines whether the calendar legend is displayed. The default value is "1".
 .TP
 .B calendar.monthsperline=N
 Determines how many months the "task calendar" command renders across the
 screen. Defaults to however many will fit. If more months than will fit are
 specified, Taskwarrior will only show as many that will fit.
 .SS JOURNAL ENTRIES
 .TP
-.B journal.time=no
+.B journal.time=0
-May be yes or no, and determines whether the 'start' and 'stop' commands should
+May be "1" or "0", and determines whether the 'start' and 'stop' commands should
-record an annotation when being executed. The default value is "no". The text of
+record an annotation when being executed. The default value is "0". The text of
 the corresponding annotations is controlled by:
 .TP
@@ -719,13 +769,13 @@ The text of the annotation that is recorded when executing the stop command and
 having set journal.time.
 .TP
-.B journal.info=on
+.B journal.info=1
 When enabled, this setting causes a change log of each task to be displayed by
-the 'info' command. Default value is "on".
+the 'info' command. Default value is "1".
 .SS HOLIDAYS
 Holidays are entered either directly in the .taskrc file or via an include file
-that is specified in .taskrc. For each holiday the name and the date is
+that is specified in .taskrc. For single-day holidays the name and the date is
 required to be given:
 .RS
@@ -734,10 +784,20 @@ required to be given:
 holiday.towel.name=Day of the towel
 .br
 holiday.towel.date=20100525
 .RE
 .RE
 For holidays that span a range of days (i.e. vacation), you can use a start date
 and an end date:
 .RS
 .RS
 .br
-holiday.sysadmin.name=System Administrator Appreciation Day
+holiday.sysadmin.name=System Administrator Appreciation Week
 .br
-holiday.sysadmin.date=20100730
+holiday.sysadmin.start=20100730
 .br
 holiday.sysadmin.end=20100805
 .RE
 .RE
@@ -767,35 +827,29 @@ be included like this:
 .RS
 .RS
 .br
-include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc
+include holidays.en-US.rc
 .RE
 .RE
 .TP
 .B monthsperline=3
 Determines how many months the "task calendar" command renders across the
 screen. Defaults to however many will fit. If more months than will fit are
 specified, Taskwarrior will only show as many that will fit.
 .SS DEPENDENCIES
 .TP
-.B dependency.reminder=on
+.B dependency.reminder=1
 Determines whether dependency chain violations generate reminders.
 .TP
-.B dependency.confirmation=yes
+.B dependency.confirmation=1
 Determines whether dependency chain repair requires confirmation.
 .SS COLOR CONTROLS
 .TP
-.B color=on
+.B color=1
-May be "on" or "off". Determines whether Taskwarrior uses color. When "off",
+May be "1" or "0". Determines whether Taskwarrior uses color. When "0",
 will use dashes (-----) to underline column headings.
 .TP
-.B fontunderline=on
+.B fontunderline=1
 Determines if font underlines or ASCII dashes should be used to underline
 headers, even when color is enabled.
 .RE
@@ -806,7 +860,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 color
+.B task colors
 .RE
 .RS
@@ -878,12 +932,11 @@ desired. In such cases, use the following option to disable this behaviour:
 .RE
 .TP
-.B rule.color.merge=yes
+.B rule.color.merge=1
-Can be "yes" or "no". When "no", disables merging of colors produced by
+Can be "1" or "0". When "0", 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
@@ -971,6 +1024,11 @@ Color of today with due tasks in calendar.
 Color of days with overdue tasks in calendar.
 .RE
 .TP
 .B color.calendar.scheduled=black on orange
 Color of days with scheduled tasks in calendar.
 .RE
 .TP
 .B color.calendar.weekend=bright white on black
 Color of weekend days in calendar.
@@ -1056,7 +1114,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                       pri.,tagged,completed,deleted
+.B                       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
@@ -1149,7 +1207,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=off
+.B urgency.inherit=0
 .RS
 Not actually a coefficient. When enabled, blocking tasks inherit
 the highest urgency value found in the tasks they block. This is
@@ -1176,6 +1234,14 @@ 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=...
@@ -1233,6 +1299,12 @@ The description for report X when running the "task help" command.
 This is a comma-separated list of columns and formatting specifiers. See the
 command 'task columns' for a full list of options and examples.
 .TP
 .B report.X.context
 A boolean value representing whether the given report should respect (apply)
 the currently active context. See CONTEXT section for details about context.
 Defaults to 1.
 .TP
 .B report.X.labels
 The labels for each column that will be used when generating report X. The
@@ -1264,6 +1336,9 @@ 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"
@@ -1425,10 +1500,27 @@ Stores the value of the currently active context.
 .RE
 .TP
-.B context.<name>=<filter>
+.B context.<name>.read=<filter>
 .RS
 Stores the definition of the context with the name <name>.
 .RE
 .br
 .B context.<name>.write=<modifications>
 .RS
 Stores the definition of the read or write context with the name <name>. Read
 context is the default filter applied when the context is active. The write
 context are the default modifications applied to newly added tasks when the
 context is active.
 .RE
 .TP
 .B context.<name>.rc.<key>=<value>
 .RS
 The rc type allows to override any configuration parameter for the current
 context, e.g. if the default command for the context home should be changed to
 home_report, the following statement could be added:
 context.home.rc.default.command=home_report
 .RE
 .SS SYNC
@@ -1488,12 +1580,12 @@ Default is "NORMAL". See GnuTLS documentation for full details.
 .RE
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2016 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2021 T. Babej, P. Beckingham, F. Hernandez.
 This man page was originally written by Federico Hernandez.
 Taskwarrior is distributed under the MIT license. See
-http://www.opensource.org/licenses/mit-license.php for more information.
+https://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
@@ -1504,18 +1596,17 @@ For more information regarding Taskwarrior, see the following:
 .TP
 The official site at
-<http://taskwarrior.org>
+<https://taskwarrior.org>
 .TP
 The official code repository at
-<https://git.tasktools.org/scm/tm/task.git>
+<https://github.com/GothenburgBitFactory/taskwarrior>
 .TP
 You can contact the project by emailing
-<support@taskwarrior.org>
+<support@GothenburgBitFactory.org>
 .SH REPORTING BUGS
 .TP
 Bugs in Taskwarrior may be reported to the issue-tracker at
-<https://bug.tasktools.org/>
+<https://github.com/GothenburgBitFactory/taskwarrior/issues>
--- a/doc/misc/themes/README
+++ b/doc/misc/themes/README
@@ -1,5 +1,8 @@
 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 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
@@ -57,7 +57,7 @@ color.uda.priority.L=
 # Tags
 color.tag.next=bold yellow
 color.tag.none=
-color.tagged=green
+color.tagged=
 # Due
 color.due=red
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
@@ -57,7 +57,7 @@ color.uda.priority.M=color250
 # Tags
 color.tag.next=rgb440
 color.tag.none=
-color.tagged=rgb031
+color.tagged=
 # Due
 color.due.today=rgb400
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
@@ -57,7 +57,7 @@ color.uda.priority.M=rgb025
 # Tags
 color.tag.next=rgb550
 color.tag.none=
-color.tagged=color246
+color.tagged=
 # Due
 color.due.today=color252
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://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 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://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 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
@@ -57,7 +57,7 @@ color.uda.priority.M=rgb030
 # Tags
 color.tag.next=rgb440
 color.tag.none=
-color.tagged=color246
+color.tagged=
 # Due
 color.due.today=color252
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
@@ -57,7 +57,7 @@ color.uda.priority.M=rgb400
 # Tags
 color.tag.next=rgb511
 color.tag.none=
-color.tagged=color246
+color.tagged=
 # Due
 color.due.today=color252
--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
@@ -57,7 +57,7 @@ color.uda.priority.L=rgb325
 # Tags
 color.tag.next=
 color.tag.none=
-color.tagged=rgb334
+color.tagged=
 # Due
 color.due=rgb015
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
@@ -57,7 +57,7 @@ color.uda.priority.L=rgb010
 # Tags
 color.tag.next=
 color.tag.none=
-color.tagged=rgb342
+color.tagged=
 # Due
 color.due=rgb440
--- a/doc/rc/holidays.be-BY.rc
+++ b/doc/rc/holidays.be-BY.rc
@@ -1,69 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/cs-CZ/2015.json
+# https://holidata.net/cs-CZ/2021.json
-# http://holidata.net/cs-CZ/2016.json
+# https://holidata.net/cs-CZ/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.cs-CZ1.name=Nový rok
-holiday.cs-CZ1.date=20150101
+holiday.cs-CZ1.date=20210101
-holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
+holiday.cs-CZ2.name=Den obnovy samostatného českého státu
-holiday.cs-CZ2.date=20150101
+holiday.cs-CZ2.date=20210101
-holiday.cs-CZ3.name=Velikonoční pondělí
+holiday.cs-CZ3.name=Velký pátek
-holiday.cs-CZ3.date=20150406
+holiday.cs-CZ3.date=20210402
-holiday.cs-CZ4.name=Svátek práce
+holiday.cs-CZ4.name=Velikonoční pondělí
-holiday.cs-CZ4.date=20150501
+holiday.cs-CZ4.date=20210405
-holiday.cs-CZ5.name=Den vítězství
+holiday.cs-CZ5.name=Svátek práce
-holiday.cs-CZ5.date=20150508
+holiday.cs-CZ5.date=20210501
-holiday.cs-CZ6.name=Den slovanských věrozvěstů
+holiday.cs-CZ6.name=Den vítězství
-holiday.cs-CZ6.date=20150705
+holiday.cs-CZ6.date=20210508
-holiday.cs-CZ7.name=Den upálení mistra Jana Husa
+holiday.cs-CZ7.name=Den slovanských věrozvěstů Cyrila a Metoděje
-holiday.cs-CZ7.date=20150706
+holiday.cs-CZ7.date=20210705
-holiday.cs-CZ8.name=Den české státnosti
+holiday.cs-CZ8.name=Den upálení mistra Jana Husa
-holiday.cs-CZ8.date=20150928
+holiday.cs-CZ8.date=20210706
-holiday.cs-CZ9.name=Den vzniku samostatného československého státu
+holiday.cs-CZ9.name=Den české státnosti
-holiday.cs-CZ9.date=20151028
+holiday.cs-CZ9.date=20210928
-holiday.cs-CZ10.name=Den boje za svobodu a demokracii
+holiday.cs-CZ10.name=Den vzniku samostatného československého státu
-holiday.cs-CZ10.date=20151117
+holiday.cs-CZ10.date=20211028
-holiday.cs-CZ11.name=Štědrý den
+holiday.cs-CZ11.name=Den boje za svobodu a demokracii a Mezinárodní den studentstva
-holiday.cs-CZ11.date=20151224
+holiday.cs-CZ11.date=20211117
-holiday.cs-CZ12.name=1. svátek vánoční
+holiday.cs-CZ12.name=Štědrý den
-holiday.cs-CZ12.date=20151225
+holiday.cs-CZ12.date=20211224
-holiday.cs-CZ13.name=2. svátek vánoční
+holiday.cs-CZ13.name=1. svátek vánoční
-holiday.cs-CZ13.date=20151226
+holiday.cs-CZ13.date=20211225
-holiday.cs-CZ14.name=Nový rok
+holiday.cs-CZ14.name=2. svátek vánoční
-holiday.cs-CZ14.date=20160101
+holiday.cs-CZ14.date=20211226
-holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
+holiday.cs-CZ15.name=Nový rok
-holiday.cs-CZ15.date=20160101
+holiday.cs-CZ15.date=20220101
-holiday.cs-CZ16.name=Velikonoční pondělí
+holiday.cs-CZ16.name=Den obnovy samostatného českého státu
-holiday.cs-CZ16.date=20160328
+holiday.cs-CZ16.date=20220101
-holiday.cs-CZ17.name=Svátek práce
+holiday.cs-CZ17.name=Velký pátek
-holiday.cs-CZ17.date=20160501
+holiday.cs-CZ17.date=20220415
-holiday.cs-CZ18.name=Den vítězství
+holiday.cs-CZ18.name=Velikonoční pondělí
-holiday.cs-CZ18.date=20160508
+holiday.cs-CZ18.date=20220418
-holiday.cs-CZ19.name=Den slovanských věrozvěstů
+holiday.cs-CZ19.name=Svátek práce
-holiday.cs-CZ19.date=20160705
+holiday.cs-CZ19.date=20220501
-holiday.cs-CZ20.name=Den upálení mistra Jana Husa
+holiday.cs-CZ20.name=Den vítězství
-holiday.cs-CZ20.date=20160706
+holiday.cs-CZ20.date=20220508
-holiday.cs-CZ21.name=Den české státnosti
+holiday.cs-CZ21.name=Den slovanských věrozvěstů Cyrila a Metoděje
-holiday.cs-CZ21.date=20160928
+holiday.cs-CZ21.date=20220705
-holiday.cs-CZ22.name=Den vzniku samostatného československého státu
+holiday.cs-CZ22.name=Den upálení mistra Jana Husa
-holiday.cs-CZ22.date=20161028
+holiday.cs-CZ22.date=20220706
-holiday.cs-CZ23.name=Den boje za svobodu a demokracii
+holiday.cs-CZ23.name=Den české státnosti
-holiday.cs-CZ23.date=20161117
+holiday.cs-CZ23.date=20220928
-holiday.cs-CZ24.name=Štědrý den
+holiday.cs-CZ24.name=Den vzniku samostatného československého státu
-holiday.cs-CZ24.date=20161224
+holiday.cs-CZ24.date=20221028
-holiday.cs-CZ25.name=1. svátek vánoční
+holiday.cs-CZ25.name=Den boje za svobodu a demokracii a Mezinárodní den studentstva
-holiday.cs-CZ25.date=20161225
+holiday.cs-CZ25.date=20221117
-holiday.cs-CZ26.name=2. svátek vánoční
+holiday.cs-CZ26.name=Štědrý den
-holiday.cs-CZ26.date=20161226
+holiday.cs-CZ26.date=20221224
 holiday.cs-CZ27.name=1. svátek vánoční
 holiday.cs-CZ27.date=20221225
 holiday.cs-CZ28.name=2. svátek vánoční
 holiday.cs-CZ28.date=20221226
--- 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
-# http://holidata.net/da-DK/2015.json
+# https://holidata.net/da-DK/2021.json
-# http://holidata.net/da-DK/2016.json
+# https://holidata.net/da-DK/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,51 +23,55 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.da-DK1.name=Nytårsdag
-holiday.da-DK1.date=20150101
+holiday.da-DK1.date=20210101
 holiday.da-DK2.name=Skærtorsdag
-holiday.da-DK2.date=20150402
+holiday.da-DK2.date=20210401
 holiday.da-DK3.name=Langfredag
-holiday.da-DK3.date=20150403
+holiday.da-DK3.date=20210402
 holiday.da-DK4.name=Påskedag
-holiday.da-DK4.date=20150405
+holiday.da-DK4.date=20210404
 holiday.da-DK5.name=Anden påskedag
-holiday.da-DK5.date=20150406
+holiday.da-DK5.date=20210405
-holiday.da-DK6.name=Kristi himmelfartsdag
+holiday.da-DK6.name=Store bededag
-holiday.da-DK6.date=20150514
+holiday.da-DK6.date=20210430
-holiday.da-DK7.name=Pinsedag
+holiday.da-DK7.name=Kristi himmelfartsdag
-holiday.da-DK7.date=20150524
+holiday.da-DK7.date=20210513
-holiday.da-DK8.name=Anden pinsedag
+holiday.da-DK8.name=Pinsedag
-holiday.da-DK8.date=20150525
+holiday.da-DK8.date=20210523
-holiday.da-DK9.name=Grundlovsdag
+holiday.da-DK9.name=Anden pinsedag
-holiday.da-DK9.date=20150605
+holiday.da-DK9.date=20210524
-holiday.da-DK10.name=Juledag
+holiday.da-DK10.name=Grundlovsdag
-holiday.da-DK10.date=20151225
+holiday.da-DK10.date=20210605
-holiday.da-DK11.name=Anden juledag
+holiday.da-DK11.name=Juledag
-holiday.da-DK11.date=20151226
+holiday.da-DK11.date=20211225
-holiday.da-DK12.name=Nytårsdag
+holiday.da-DK12.name=Anden juledag
-holiday.da-DK12.date=20160101
+holiday.da-DK12.date=20211226
-holiday.da-DK13.name=Skærtorsdag
+holiday.da-DK13.name=Nytårsdag
-holiday.da-DK13.date=20160324
+holiday.da-DK13.date=20220101
-holiday.da-DK14.name=Langfredag
+holiday.da-DK14.name=Skærtorsdag
-holiday.da-DK14.date=20160325
+holiday.da-DK14.date=20220414
-holiday.da-DK15.name=Påskedag
+holiday.da-DK15.name=Langfredag
-holiday.da-DK15.date=20160327
+holiday.da-DK15.date=20220415
-holiday.da-DK16.name=Anden påskedag
+holiday.da-DK16.name=Påskedag
-holiday.da-DK16.date=20160328
+holiday.da-DK16.date=20220417
-holiday.da-DK17.name=Kristi himmelfartsdag
+holiday.da-DK17.name=Anden påskedag
-holiday.da-DK17.date=20160505
+holiday.da-DK17.date=20220418
-holiday.da-DK18.name=Pinsedag
+holiday.da-DK18.name=Store bededag
-holiday.da-DK18.date=20160515
+holiday.da-DK18.date=20220513
-holiday.da-DK19.name=Anden pinsedag
+holiday.da-DK19.name=Kristi himmelfartsdag
-holiday.da-DK19.date=20160516
+holiday.da-DK19.date=20220526
 holiday.da-DK20.name=Grundlovsdag
-holiday.da-DK20.date=20160605
+holiday.da-DK20.date=20220605
-holiday.da-DK21.name=Juledag
+holiday.da-DK21.name=Pinsedag
-holiday.da-DK21.date=20161225
+holiday.da-DK21.date=20220605
-holiday.da-DK22.name=Anden juledag
+holiday.da-DK22.name=Anden pinsedag
-holiday.da-DK22.date=20161226
+holiday.da-DK22.date=20220606
 holiday.da-DK23.name=Juledag
 holiday.da-DK23.date=20221225
 holiday.da-DK24.name=Anden juledag
 holiday.da-DK24.date=20221226
--- 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
-# http://holidata.net/de-AT/2015.json
+# https://holidata.net/de-AT/2021.json
-# http://holidata.net/de-AT/2016.json
+# https://holidata.net/de-AT/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-AT1.name=Neujahr
-holiday.de-AT1.date=20150101
+holiday.de-AT1.date=20210101
-holiday.de-AT2.name=Heilige drei KÃ¶nige
+holiday.de-AT2.name=Heilige drei Könige
-holiday.de-AT2.date=20150106
+holiday.de-AT2.date=20210106
-holiday.de-AT3.name=Josef (K, St, T, V)
+holiday.de-AT3.name=Josef
-holiday.de-AT3.date=20150319
+holiday.de-AT3.date=20210319
 holiday.de-AT4.name=Karfreitag
-holiday.de-AT4.date=20150403
+holiday.de-AT4.date=20210402
 holiday.de-AT5.name=Ostersonntag
-holiday.de-AT5.date=20150405
+holiday.de-AT5.date=20210404
 holiday.de-AT6.name=Ostermontag
-holiday.de-AT6.date=20150406
+holiday.de-AT6.date=20210405
 holiday.de-AT7.name=Staatsfeiertag
-holiday.de-AT7.date=20150501
+holiday.de-AT7.date=20210501
-holiday.de-AT8.name=Florian (O)
+holiday.de-AT8.name=Florian
-holiday.de-AT8.date=20150504
+holiday.de-AT8.date=20210504
 holiday.de-AT9.name=Christi Himmelfahrt
-holiday.de-AT9.date=20150514
+holiday.de-AT9.date=20210513
 holiday.de-AT10.name=Pfingstsonntag
-holiday.de-AT10.date=20150524
+holiday.de-AT10.date=20210523
 holiday.de-AT11.name=Pfingstmontag
-holiday.de-AT11.date=20150525
+holiday.de-AT11.date=20210524
 holiday.de-AT12.name=Fronleichnam
-holiday.de-AT12.date=20150604
+holiday.de-AT12.date=20210603
 holiday.de-AT13.name=Mariä Himmelfahrt
-holiday.de-AT13.date=20150815
+holiday.de-AT13.date=20210815
-holiday.de-AT14.name=Rupert (S)
+holiday.de-AT14.name=Rupert
-holiday.de-AT14.date=20150924
+holiday.de-AT14.date=20210924
-holiday.de-AT15.name=Tag der Volksabstimmung (K)
+holiday.de-AT15.name=Tag der Volksabstimmung
-holiday.de-AT15.date=20151010
+holiday.de-AT15.date=20211010
 holiday.de-AT16.name=Nationalfeiertag
-holiday.de-AT16.date=20151026
+holiday.de-AT16.date=20211026
 holiday.de-AT17.name=Allerheiligen
-holiday.de-AT17.date=20151101
+holiday.de-AT17.date=20211101
-holiday.de-AT18.name=Martin (B)
+holiday.de-AT18.name=Martin
-holiday.de-AT18.date=20151111
+holiday.de-AT18.date=20211111
-holiday.de-AT19.name=Leopold (W, N)
+holiday.de-AT19.name=Leopold
-holiday.de-AT19.date=20151115
+holiday.de-AT19.date=20211115
 holiday.de-AT20.name=Mariä Empfängnis
-holiday.de-AT20.date=20151208
+holiday.de-AT20.date=20211208
 holiday.de-AT21.name=Heiliger Abend
-holiday.de-AT21.date=20151224
+holiday.de-AT21.date=20211224
 holiday.de-AT22.name=Christtag
-holiday.de-AT22.date=20151225
+holiday.de-AT22.date=20211225
 holiday.de-AT23.name=Stefanitag
-holiday.de-AT23.date=20151226
+holiday.de-AT23.date=20211226
 holiday.de-AT24.name=Silvester
-holiday.de-AT24.date=20151231
+holiday.de-AT24.date=20211231
 holiday.de-AT25.name=Neujahr
-holiday.de-AT25.date=20160101
+holiday.de-AT25.date=20220101
-holiday.de-AT26.name=Heilige drei KÃ¶nige
+holiday.de-AT26.name=Heilige drei Könige
-holiday.de-AT26.date=20160106
+holiday.de-AT26.date=20220106
-holiday.de-AT27.name=Josef (K, St, T, V)
+holiday.de-AT27.name=Josef
-holiday.de-AT27.date=20160319
+holiday.de-AT27.date=20220319
 holiday.de-AT28.name=Karfreitag
-holiday.de-AT28.date=20160325
+holiday.de-AT28.date=20220415
 holiday.de-AT29.name=Ostersonntag
-holiday.de-AT29.date=20160327
+holiday.de-AT29.date=20220417
 holiday.de-AT30.name=Ostermontag
-holiday.de-AT30.date=20160328
+holiday.de-AT30.date=20220418
 holiday.de-AT31.name=Staatsfeiertag
-holiday.de-AT31.date=20160501
+holiday.de-AT31.date=20220501
-holiday.de-AT32.name=Florian (O)
+holiday.de-AT32.name=Florian
-holiday.de-AT32.date=20160504
+holiday.de-AT32.date=20220504
 holiday.de-AT33.name=Christi Himmelfahrt
-holiday.de-AT33.date=20160505
+holiday.de-AT33.date=20220526
 holiday.de-AT34.name=Pfingstsonntag
-holiday.de-AT34.date=20160515
+holiday.de-AT34.date=20220605
 holiday.de-AT35.name=Pfingstmontag
-holiday.de-AT35.date=20160516
+holiday.de-AT35.date=20220606
 holiday.de-AT36.name=Fronleichnam
-holiday.de-AT36.date=20160526
+holiday.de-AT36.date=20220616
 holiday.de-AT37.name=Mariä Himmelfahrt
-holiday.de-AT37.date=20160815
+holiday.de-AT37.date=20220815
-holiday.de-AT38.name=Rupert (S)
+holiday.de-AT38.name=Rupert
-holiday.de-AT38.date=20160924
+holiday.de-AT38.date=20220924
-holiday.de-AT39.name=Tag der Volksabstimmung (K)
+holiday.de-AT39.name=Tag der Volksabstimmung
-holiday.de-AT39.date=20161010
+holiday.de-AT39.date=20221010
 holiday.de-AT40.name=Nationalfeiertag
-holiday.de-AT40.date=20161026
+holiday.de-AT40.date=20221026
 holiday.de-AT41.name=Allerheiligen
-holiday.de-AT41.date=20161101
+holiday.de-AT41.date=20221101
-holiday.de-AT42.name=Martin (B)
+holiday.de-AT42.name=Martin
-holiday.de-AT42.date=20161111
+holiday.de-AT42.date=20221111
-holiday.de-AT43.name=Leopold (W, N)
+holiday.de-AT43.name=Leopold
-holiday.de-AT43.date=20161115
+holiday.de-AT43.date=20221115
 holiday.de-AT44.name=Mariä Empfängnis
-holiday.de-AT44.date=20161208
+holiday.de-AT44.date=20221208
 holiday.de-AT45.name=Heiliger Abend
-holiday.de-AT45.date=20161224
+holiday.de-AT45.date=20221224
 holiday.de-AT46.name=Christtag
-holiday.de-AT46.date=20161225
+holiday.de-AT46.date=20221225
 holiday.de-AT47.name=Stefanitag
-holiday.de-AT47.date=20161226
+holiday.de-AT47.date=20221226
 holiday.de-AT48.name=Silvester
-holiday.de-AT48.date=20161231
+holiday.de-AT48.date=20221231
--- 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
-# http://holidata.net/de-BE/2015.json
+# https://holidata.net/de-BE/2021.json
-# http://holidata.net/de-BE/2016.json
+# https://holidata.net/de-BE/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-BE1.name=Neujahr
-holiday.de-BE1.date=20150101
+holiday.de-BE1.date=20210101
 holiday.de-BE2.name=Ostern
-holiday.de-BE2.date=20150405
+holiday.de-BE2.date=20210404
 holiday.de-BE3.name=Ostermontag
-holiday.de-BE3.date=20150406
+holiday.de-BE3.date=20210405
 holiday.de-BE4.name=Tag der Arbeit
-holiday.de-BE4.date=20150501
+holiday.de-BE4.date=20210501
 holiday.de-BE5.name=Christi Himmelfahrt
-holiday.de-BE5.date=20150514
+holiday.de-BE5.date=20210513
 holiday.de-BE6.name=Pfingsten
-holiday.de-BE6.date=20150524
+holiday.de-BE6.date=20210523
 holiday.de-BE7.name=Pfingstmontag
-holiday.de-BE7.date=20150525
+holiday.de-BE7.date=20210524
 holiday.de-BE8.name=Nationalfeiertag
-holiday.de-BE8.date=20150721
+holiday.de-BE8.date=20210721
 holiday.de-BE9.name=Mariä Himmelfahrt
-holiday.de-BE9.date=20150815
+holiday.de-BE9.date=20210815
 holiday.de-BE10.name=Allerheiligen
-holiday.de-BE10.date=20151101
+holiday.de-BE10.date=20211101
 holiday.de-BE11.name=Waffenstillstand
-holiday.de-BE11.date=20151111
+holiday.de-BE11.date=20211111
 holiday.de-BE12.name=Weihnacht
-holiday.de-BE12.date=20151225
+holiday.de-BE12.date=20211225
 holiday.de-BE13.name=Neujahr
-holiday.de-BE13.date=20160101
+holiday.de-BE13.date=20220101
 holiday.de-BE14.name=Ostern
-holiday.de-BE14.date=20160527
+holiday.de-BE14.date=20220417
 holiday.de-BE15.name=Ostermontag
-holiday.de-BE15.date=20160528
+holiday.de-BE15.date=20220418
 holiday.de-BE16.name=Tag der Arbeit
-holiday.de-BE16.date=20160501
+holiday.de-BE16.date=20220501
 holiday.de-BE17.name=Christi Himmelfahrt
-holiday.de-BE17.date=20160505
+holiday.de-BE17.date=20220526
 holiday.de-BE18.name=Pfingsten
-holiday.de-BE18.date=20160515
+holiday.de-BE18.date=20220605
 holiday.de-BE19.name=Pfingstmontag
-holiday.de-BE19.date=20160516
+holiday.de-BE19.date=20220606
 holiday.de-BE20.name=Nationalfeiertag
-holiday.de-BE20.date=20160721
+holiday.de-BE20.date=20220721
 holiday.de-BE21.name=Mariä Himmelfahrt
-holiday.de-BE21.date=20160815
+holiday.de-BE21.date=20220815
 holiday.de-BE22.name=Allerheiligen
-holiday.de-BE22.date=20161101
+holiday.de-BE22.date=20221101
 holiday.de-BE23.name=Waffenstillstand
-holiday.de-BE23.date=20161111
+holiday.de-BE23.date=20221111
 holiday.de-BE24.name=Weihnacht
-holiday.de-BE24.date=20161225
+holiday.de-BE24.date=20221225
--- 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
-# http://holidata.net/de-CH/2015.json
+# https://holidata.net/de-CH/2021.json
-# http://holidata.net/de-CH/2016.json
+# https://holidata.net/de-CH/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-CH1.name=Neujahrstag
-holiday.de-CH1.date=20150101
+holiday.de-CH1.date=20210101
 holiday.de-CH2.name=Berchtoldstag
-holiday.de-CH2.date=20150102
+holiday.de-CH2.date=20210102
 holiday.de-CH3.name=Heilige Drei Könige
-holiday.de-CH3.date=20150106
+holiday.de-CH3.date=20210106
 holiday.de-CH4.name=Josefstag
-holiday.de-CH4.date=20150319
+holiday.de-CH4.date=20210319
 holiday.de-CH5.name=Karfreitag
-holiday.de-CH5.date=20150403
+holiday.de-CH5.date=20210402
 holiday.de-CH6.name=Ostersonntag
-holiday.de-CH6.date=20150405
+holiday.de-CH6.date=20210404
 holiday.de-CH7.name=Ostermontag
-holiday.de-CH7.date=20150406
+holiday.de-CH7.date=20210405
 holiday.de-CH8.name=Tag der Arbeit
-holiday.de-CH8.date=20150501
+holiday.de-CH8.date=20210501
 holiday.de-CH9.name=Auffahrt
-holiday.de-CH9.date=20150514
+holiday.de-CH9.date=20210513
 holiday.de-CH10.name=Pfingstsonntag
-holiday.de-CH10.date=20150524
+holiday.de-CH10.date=20210523
 holiday.de-CH11.name=Pfingstmontag
-holiday.de-CH11.date=20150525
+holiday.de-CH11.date=20210524
 holiday.de-CH12.name=Fronleichnam
-holiday.de-CH12.date=20150604
+holiday.de-CH12.date=20210603
 holiday.de-CH13.name=Bundesfeier
-holiday.de-CH13.date=20150801
+holiday.de-CH13.date=20210801
 holiday.de-CH14.name=Mariä Himmelfahrt
-holiday.de-CH14.date=20150815
+holiday.de-CH14.date=20210815
 holiday.de-CH15.name=Allerheiligen
-holiday.de-CH15.date=20151101
+holiday.de-CH15.date=20211101
 holiday.de-CH16.name=Mariä Empfängnis
-holiday.de-CH16.date=20151208
+holiday.de-CH16.date=20211208
 holiday.de-CH17.name=Weihnachtstag
-holiday.de-CH17.date=20151225
+holiday.de-CH17.date=20211225
 holiday.de-CH18.name=Stephanstag
-holiday.de-CH18.date=20151226
+holiday.de-CH18.date=20211226
 holiday.de-CH19.name=Neujahrstag
-holiday.de-CH19.date=20160101
+holiday.de-CH19.date=20220101
 holiday.de-CH20.name=Berchtoldstag
-holiday.de-CH20.date=20160102
+holiday.de-CH20.date=20220102
 holiday.de-CH21.name=Heilige Drei Könige
-holiday.de-CH21.date=20160106
+holiday.de-CH21.date=20220106
 holiday.de-CH22.name=Josefstag
-holiday.de-CH22.date=20160319
+holiday.de-CH22.date=20220319
 holiday.de-CH23.name=Karfreitag
-holiday.de-CH23.date=20160325
+holiday.de-CH23.date=20220415
 holiday.de-CH24.name=Ostersonntag
-holiday.de-CH24.date=20160327
+holiday.de-CH24.date=20220417
 holiday.de-CH25.name=Ostermontag
-holiday.de-CH25.date=20160328
+holiday.de-CH25.date=20220418
 holiday.de-CH26.name=Tag der Arbeit
-holiday.de-CH26.date=20160501
+holiday.de-CH26.date=20220501
 holiday.de-CH27.name=Auffahrt
-holiday.de-CH27.date=20160505
+holiday.de-CH27.date=20220526
 holiday.de-CH28.name=Pfingstsonntag
-holiday.de-CH28.date=20160515
+holiday.de-CH28.date=20220605
 holiday.de-CH29.name=Pfingstmontag
-holiday.de-CH29.date=20160516
+holiday.de-CH29.date=20220606
 holiday.de-CH30.name=Fronleichnam
-holiday.de-CH30.date=20160526
+holiday.de-CH30.date=20220616
 holiday.de-CH31.name=Bundesfeier
-holiday.de-CH31.date=20160801
+holiday.de-CH31.date=20220801
 holiday.de-CH32.name=Mariä Himmelfahrt
-holiday.de-CH32.date=20160815
+holiday.de-CH32.date=20220815
 holiday.de-CH33.name=Allerheiligen
-holiday.de-CH33.date=20161101
+holiday.de-CH33.date=20221101
 holiday.de-CH34.name=Mariä Empfängnis
-holiday.de-CH34.date=20161208
+holiday.de-CH34.date=20221208
 holiday.de-CH35.name=Weihnachtstag
-holiday.de-CH35.date=20161225
+holiday.de-CH35.date=20221225
 holiday.de-CH36.name=Stephanstag
-holiday.de-CH36.date=20161226
+holiday.de-CH36.date=20221226
--- 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
-# http://holidata.net/de-DE/2015.json
+# https://holidata.net/de-DE/2021.json
-# http://holidata.net/de-DE/2016.json
+# https://holidata.net/de-DE/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,87 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.de-DE1.name=Neujahr
-holiday.de-DE1.date=20150101
+holiday.de-DE1.date=20210101
 holiday.de-DE2.name=Heilige drei Könige
-holiday.de-DE2.date=20150106
+holiday.de-DE2.date=20210106
-holiday.de-DE3.name=Karfreitag
+holiday.de-DE3.name=Internationaler Frauentag
-holiday.de-DE3.date=20150403
+holiday.de-DE3.date=20210308
-holiday.de-DE4.name=Ostern
+holiday.de-DE4.name=Karfreitag
-holiday.de-DE4.date=20150405
+holiday.de-DE4.date=20210402
-holiday.de-DE5.name=Ostermontag
+holiday.de-DE5.name=Ostern
-holiday.de-DE5.date=20150406
+holiday.de-DE5.date=20210404
-holiday.de-DE6.name=Erster Maifeiertag
+holiday.de-DE6.name=Ostermontag
-holiday.de-DE6.date=20150501
+holiday.de-DE6.date=20210405
-holiday.de-DE7.name=Christi Himmelfahrt
+holiday.de-DE7.name=Erster Maifeiertag
-holiday.de-DE7.date=20150514
+holiday.de-DE7.date=20210501
-holiday.de-DE8.name=Pfingstsonntag
+holiday.de-DE8.name=Christi Himmelfahrt
-holiday.de-DE8.date=20150524
+holiday.de-DE8.date=20210513
-holiday.de-DE9.name=Pfingstmontag
+holiday.de-DE9.name=Pfingstsonntag
-holiday.de-DE9.date=20150525
+holiday.de-DE9.date=20210523
-holiday.de-DE10.name=Fronleichnam
+holiday.de-DE10.name=Pfingstmontag
-holiday.de-DE10.date=20150604
+holiday.de-DE10.date=20210524
-holiday.de-DE11.name=Mariä Himmelfahrt
+holiday.de-DE11.name=Fronleichnam
-holiday.de-DE11.date=20150815
+holiday.de-DE11.date=20210603
-holiday.de-DE12.name=Tag der Deutschen Einheit
+holiday.de-DE12.name=Mariä Himmelfahrt
-holiday.de-DE12.date=20151003
+holiday.de-DE12.date=20210815
-holiday.de-DE13.name=Reformationstag
+holiday.de-DE13.name=Tag der Deutschen Einheit
-holiday.de-DE13.date=20151031
+holiday.de-DE13.date=20211003
-holiday.de-DE14.name=Allerheiligen
+holiday.de-DE14.name=Reformationstag
-holiday.de-DE14.date=20151101
+holiday.de-DE14.date=20211031
-holiday.de-DE15.name=Buß- und Bettag
+holiday.de-DE15.name=Allerheiligen
-holiday.de-DE15.date=20151118
+holiday.de-DE15.date=20211101
-holiday.de-DE16.name=Heilig Abend
+holiday.de-DE16.name=Buß- und Bettag
-holiday.de-DE16.date=20151224
+holiday.de-DE16.date=20211117
-holiday.de-DE17.name=Weihnachtstag
+holiday.de-DE17.name=Heilig Abend
-holiday.de-DE17.date=20151225
+holiday.de-DE17.date=20211224
-holiday.de-DE18.name=Zweiter Weihnachtstag
+holiday.de-DE18.name=Weihnachtstag
-holiday.de-DE18.date=20151226
+holiday.de-DE18.date=20211225
-holiday.de-DE19.name=Silvester
+holiday.de-DE19.name=Zweiter Weihnachtstag
-holiday.de-DE19.date=20151231
+holiday.de-DE19.date=20211226
-holiday.de-DE20.name=Neujahr
+holiday.de-DE20.name=Silvester
-holiday.de-DE20.date=20160101
+holiday.de-DE20.date=20211231
-holiday.de-DE21.name=Heilige drei Könige
+holiday.de-DE21.name=Neujahr
-holiday.de-DE21.date=20160106
+holiday.de-DE21.date=20220101
-holiday.de-DE22.name=Karfreitag
+holiday.de-DE22.name=Heilige drei Könige
-holiday.de-DE22.date=20160325
+holiday.de-DE22.date=20220106
-holiday.de-DE23.name=Ostern
+holiday.de-DE23.name=Internationaler Frauentag
-holiday.de-DE23.date=20160327
+holiday.de-DE23.date=20220308
-holiday.de-DE24.name=Ostermontag
+holiday.de-DE24.name=Karfreitag
-holiday.de-DE24.date=20160328
+holiday.de-DE24.date=20220415
-holiday.de-DE25.name=Erster Maifeiertag
+holiday.de-DE25.name=Ostern
-holiday.de-DE25.date=20160501
+holiday.de-DE25.date=20220417
-holiday.de-DE26.name=Christi Himmelfahrt
+holiday.de-DE26.name=Ostermontag
-holiday.de-DE26.date=20160505
+holiday.de-DE26.date=20220418
-holiday.de-DE27.name=Pfingstsonntag
+holiday.de-DE27.name=Erster Maifeiertag
-holiday.de-DE27.date=20160515
+holiday.de-DE27.date=20220501
-holiday.de-DE28.name=Pfingstmontag
+holiday.de-DE28.name=Christi Himmelfahrt
-holiday.de-DE28.date=20160516
+holiday.de-DE28.date=20220526
-holiday.de-DE29.name=Fronleichnam
+holiday.de-DE29.name=Pfingstsonntag
-holiday.de-DE29.date=20160526
+holiday.de-DE29.date=20220605
-holiday.de-DE30.name=Mariä Himmelfahrt
+holiday.de-DE30.name=Pfingstmontag
-holiday.de-DE30.date=20160815
+holiday.de-DE30.date=20220606
-holiday.de-DE31.name=Tag der Deutschen Einheit
+holiday.de-DE31.name=Fronleichnam
-holiday.de-DE31.date=20161003
+holiday.de-DE31.date=20220616
-holiday.de-DE32.name=Reformationstag
+holiday.de-DE32.name=Mariä Himmelfahrt
-holiday.de-DE32.date=20161031
+holiday.de-DE32.date=20220815
-holiday.de-DE33.name=Allerheiligen
+holiday.de-DE33.name=Tag der Deutschen Einheit
-holiday.de-DE33.date=20161101
+holiday.de-DE33.date=20221003
-holiday.de-DE34.name=Buß- und Bettag
+holiday.de-DE34.name=Reformationstag
-holiday.de-DE34.date=20161116
+holiday.de-DE34.date=20221031
-holiday.de-DE35.name=Heilig Abend
+holiday.de-DE35.name=Allerheiligen
-holiday.de-DE35.date=20161224
+holiday.de-DE35.date=20221101
-holiday.de-DE36.name=Weihnachtstag
+holiday.de-DE36.name=Buß- und Bettag
-holiday.de-DE36.date=20161225
+holiday.de-DE36.date=20221116
-holiday.de-DE37.name=Zweiter Weihnachtstag
+holiday.de-DE37.name=Heilig Abend
-holiday.de-DE37.date=20161226
+holiday.de-DE37.date=20221224
-holiday.de-DE38.name=Silvester
+holiday.de-DE38.name=Weihnachtstag
-holiday.de-DE38.date=20161231
+holiday.de-DE38.date=20221225
 holiday.de-DE39.name=Zweiter Weihnachtstag
 holiday.de-DE39.date=20221226
 holiday.de-DE40.name=Silvester
 holiday.de-DE40.date=20221231
--- 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
-# http://holidata.net/el-GR/2015.json
+# https://holidata.net/el-GR/2021.json
-# http://holidata.net/el-GR/2016.json
+# https://holidata.net/el-GR/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.el-GR1.name=Πρωτοχρονιά
-holiday.el-GR1.date=20150101
+holiday.el-GR1.date=20210101
 holiday.el-GR2.name=Θεοφάνεια
-holiday.el-GR2.date=20150106
+holiday.el-GR2.date=20210106
 holiday.el-GR3.name=Καθαρά Δευτέρα
-holiday.el-GR3.date=20150223
+holiday.el-GR3.date=20210315
 holiday.el-GR4.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
-holiday.el-GR4.date=20150325
+holiday.el-GR4.date=20210325
-holiday.el-GR5.name=Πρωτομαγιά
+holiday.el-GR5.name=Μεγάλη Παρασκευή
-holiday.el-GR5.date=20150418
+holiday.el-GR5.date=20210430
-holiday.el-GR6.name=Μεγάλη Παρασκευή
+holiday.el-GR6.name=Μεγάλο Σάββατο
-holiday.el-GR6.date=20150410
+holiday.el-GR6.date=20210501
-holiday.el-GR7.name=Μεγάλο Σάββατο
+holiday.el-GR7.name=Πρωτομαγιά
-holiday.el-GR7.date=20150411
+holiday.el-GR7.date=20210501
 holiday.el-GR8.name=Πάσχα
-holiday.el-GR8.date=20150412
+holiday.el-GR8.date=20210502
 holiday.el-GR9.name=Δευτέρα του Πάσχα
-holiday.el-GR9.date=20150413
+holiday.el-GR9.date=20210503
 holiday.el-GR10.name=Δευτέρα του Αγίου Πνεύματος
-holiday.el-GR10.date=20150601
+holiday.el-GR10.date=20210621
 holiday.el-GR11.name=Κοίμηση της Θεοτόκου
-holiday.el-GR11.date=20150815
+holiday.el-GR11.date=20210815
 holiday.el-GR12.name=Ημέρα του ΌΧΙ
-holiday.el-GR12.date=20151028
+holiday.el-GR12.date=20211028
 holiday.el-GR13.name=Χριστούγεννα
-holiday.el-GR13.date=20151225
+holiday.el-GR13.date=20211225
 holiday.el-GR14.name=Επόμενη ημέρα Χριστουγέννων
-holiday.el-GR14.date=20151226
+holiday.el-GR14.date=20211226
 holiday.el-GR15.name=Πρωτοχρονιά
-holiday.el-GR15.date=20160101
+holiday.el-GR15.date=20220101
 holiday.el-GR16.name=Θεοφάνεια
-holiday.el-GR16.date=20160106
+holiday.el-GR16.date=20220106
 holiday.el-GR17.name=Καθαρά Δευτέρα
-holiday.el-GR17.date=20160314
+holiday.el-GR17.date=20220307
 holiday.el-GR18.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
-holiday.el-GR18.date=20160325
+holiday.el-GR18.date=20220325
-holiday.el-GR19.name=Πρωτομαγιά
+holiday.el-GR19.name=Μεγάλη Παρασκευή
-holiday.el-GR19.date=20160418
+holiday.el-GR19.date=20220422
-holiday.el-GR20.name=Μεγάλη Παρασκευή
+holiday.el-GR20.name=Μεγάλο Σάββατο
-holiday.el-GR20.date=20160429
+holiday.el-GR20.date=20220423
-holiday.el-GR21.name=Μεγάλο Σάββατο
+holiday.el-GR21.name=Πάσχα
-holiday.el-GR21.date=20160430
+holiday.el-GR21.date=20220424
-holiday.el-GR22.name=Πάσχα
+holiday.el-GR22.name=Δευτέρα του Πάσχα
-holiday.el-GR22.date=20160501
+holiday.el-GR22.date=20220425
-holiday.el-GR23.name=Δευτέρα του Πάσχα
+holiday.el-GR23.name=Πρωτομαγιά
-holiday.el-GR23.date=20160502
+holiday.el-GR23.date=20220501
 holiday.el-GR24.name=Δευτέρα του Αγίου Πνεύματος
-holiday.el-GR24.date=20160620
+holiday.el-GR24.date=20220613
 holiday.el-GR25.name=Κοίμηση της Θεοτόκου
-holiday.el-GR25.date=20160815
+holiday.el-GR25.date=20220815
 holiday.el-GR26.name=Ημέρα του ΌΧΙ
-holiday.el-GR26.date=20161028
+holiday.el-GR26.date=20221028
 holiday.el-GR27.name=Χριστούγεννα
-holiday.el-GR27.date=20161225
+holiday.el-GR27.date=20221225
 holiday.el-GR28.name=Επόμενη ημέρα Χριστουγέννων
-holiday.el-GR28.date=20161226
+holiday.el-GR28.date=20221226
--- a/doc/rc/holidays.en-AU.rc
+++ b/doc/rc/holidays.en-AU.rc
@@ -1,119 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/en-CA/2015.json
+# https://holidata.net/en-CA/2021.json
-# http://holidata.net/en-CA/2016.json
+# https://holidata.net/en-CA/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,83 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-CA1.name=New Year's Day
-holiday.en-CA1.date=20150101
+holiday.en-CA1.date=20210101
 holiday.en-CA2.name=Family Day
-holiday.en-CA2.date=20150209
+holiday.en-CA2.date=20210215
-holiday.en-CA3.name=Good Friday
+holiday.en-CA3.name=Louis Riel Day
-holiday.en-CA3.date=20150403
+holiday.en-CA3.date=20210215
-holiday.en-CA4.name=Easter Monday
+holiday.en-CA4.name=Islander Day
-holiday.en-CA4.date=20150406
+holiday.en-CA4.date=20210215
-holiday.en-CA5.name=Victoria Day
+holiday.en-CA5.name=Good Friday
-holiday.en-CA5.date=20150518
+holiday.en-CA5.date=20210402
-holiday.en-CA6.name=Canada Day
+holiday.en-CA6.name=Easter Monday
-holiday.en-CA6.date=20150701
+holiday.en-CA6.date=20210405
-holiday.en-CA7.name=First Monday of August
+holiday.en-CA7.name=National Patriots' Day
-holiday.en-CA7.date=20150803
+holiday.en-CA7.date=20210524
-holiday.en-CA8.name=Labour Day
+holiday.en-CA8.name=Victoria Day
-holiday.en-CA8.date=20150907
+holiday.en-CA8.date=20210524
-holiday.en-CA9.name=Thanksgiving Day
+holiday.en-CA9.name=National Holiday
-holiday.en-CA9.date=20151012
+holiday.en-CA9.date=20210624
-holiday.en-CA10.name=Remembrance Day
+holiday.en-CA10.name=Canada Day
-holiday.en-CA10.date=20151111
+holiday.en-CA10.date=20210701
-holiday.en-CA11.name=Christmas Day
+holiday.en-CA11.name=August Civic Holiday
-holiday.en-CA11.date=20151225
+holiday.en-CA11.date=20210802
-holiday.en-CA12.name=Boxing Day
+holiday.en-CA12.name=Saskatchewan Day
-holiday.en-CA12.date=20151226
+holiday.en-CA12.date=20210802
-holiday.en-CA13.name=New Year's Day
+holiday.en-CA13.name=Heritage Day
-holiday.en-CA13.date=20160101
+holiday.en-CA13.date=20210802
-holiday.en-CA14.name=Family Day
+holiday.en-CA14.name=New Brunswick Day
-holiday.en-CA14.date=20160208
+holiday.en-CA14.date=20210802
-holiday.en-CA15.name=Good Friday
+holiday.en-CA15.name=Labour Day
-holiday.en-CA15.date=20160325
+holiday.en-CA15.date=20210906
-holiday.en-CA16.name=Easter Monday
+holiday.en-CA16.name=Thanksgiving Day
-holiday.en-CA16.date=20160328
+holiday.en-CA16.date=20211011
-holiday.en-CA17.name=Victoria Day
+holiday.en-CA17.name=Remembrance Day
-holiday.en-CA17.date=20160523
+holiday.en-CA17.date=20211111
-holiday.en-CA18.name=Canada Day
+holiday.en-CA18.name=Christmas Day
-holiday.en-CA18.date=20160701
+holiday.en-CA18.date=20211225
-holiday.en-CA19.name=First Monday of August
+holiday.en-CA19.name=Boxing Day
-holiday.en-CA19.date=20160801
+holiday.en-CA19.date=20211226
-holiday.en-CA20.name=Labour Day
+holiday.en-CA20.name=New Year's Day
-holiday.en-CA20.date=20160905
+holiday.en-CA20.date=20220101
-holiday.en-CA21.name=Thanksgiving Day
+holiday.en-CA21.name=Family Day
-holiday.en-CA21.date=20161010
+holiday.en-CA21.date=20220221
-holiday.en-CA22.name=Remembrance Day
+holiday.en-CA22.name=Louis Riel Day
-holiday.en-CA22.date=20161111
+holiday.en-CA22.date=20220221
-holiday.en-CA23.name=Christmas Day
+holiday.en-CA23.name=Islander Day
-holiday.en-CA23.date=20161225
+holiday.en-CA23.date=20220221
-holiday.en-CA24.name=Boxing Day
+holiday.en-CA24.name=Good Friday
-holiday.en-CA24.date=20161226
+holiday.en-CA24.date=20220415
 holiday.en-CA25.name=Easter Monday
 holiday.en-CA25.date=20220418
 holiday.en-CA26.name=National Patriots' Day
 holiday.en-CA26.date=20220523
 holiday.en-CA27.name=Victoria Day
 holiday.en-CA27.date=20220523
 holiday.en-CA28.name=National Holiday
 holiday.en-CA28.date=20220624
 holiday.en-CA29.name=Canada Day
 holiday.en-CA29.date=20220701
 holiday.en-CA30.name=August Civic Holiday
 holiday.en-CA30.date=20220801
 holiday.en-CA31.name=Saskatchewan Day
 holiday.en-CA31.date=20220801
 holiday.en-CA32.name=Heritage Day
 holiday.en-CA32.date=20220801
 holiday.en-CA33.name=New Brunswick Day
 holiday.en-CA33.date=20220801
 holiday.en-CA34.name=Labour Day
 holiday.en-CA34.date=20220905
 holiday.en-CA35.name=Thanksgiving Day
 holiday.en-CA35.date=20221010
 holiday.en-CA36.name=Remembrance Day
 holiday.en-CA36.date=20221111
 holiday.en-CA37.name=Christmas Day
 holiday.en-CA37.date=20221225
 holiday.en-CA38.name=Boxing Day
 holiday.en-CA38.date=20221226
--- 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
-# http://holidata.net/en-GB/2015.json
+# https://holidata.net/en-GB/2021.json
-# http://holidata.net/en-GB/2016.json
+# https://holidata.net/en-GB/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,39 +23,47 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-GB1.name=New Year's Day
-holiday.en-GB1.date=20150101
+holiday.en-GB1.date=20210101
 holiday.en-GB2.name=Good Friday
-holiday.en-GB2.date=20150403
+holiday.en-GB2.date=20210402
 holiday.en-GB3.name=Easter Monday
-holiday.en-GB3.date=20150406
+holiday.en-GB3.date=20210405
 holiday.en-GB4.name=Early May Bank Holiday
-holiday.en-GB4.date=20150504
+holiday.en-GB4.date=20210503
 holiday.en-GB5.name=Spring Bank Holiday
-holiday.en-GB5.date=20150525
+holiday.en-GB5.date=20210531
 holiday.en-GB6.name=August Bank Holiday
-holiday.en-GB6.date=20150831
+holiday.en-GB6.date=20210830
 holiday.en-GB7.name=Christmas Day
-holiday.en-GB7.date=20151225
+holiday.en-GB7.date=20211225
 holiday.en-GB8.name=Boxing Day
-holiday.en-GB8.date=20151226
+holiday.en-GB8.date=20211226
-holiday.en-GB9.name=New Year's Day
+holiday.en-GB9.name=Christmas Day (observed)
-holiday.en-GB9.date=20160101
+holiday.en-GB9.date=20211227
-holiday.en-GB10.name=Good Friday
+holiday.en-GB10.name=Boxing Day (observed)
-holiday.en-GB10.date=20160325
+holiday.en-GB10.date=20211228
-holiday.en-GB11.name=Easter Monday
+holiday.en-GB11.name=New Year's Day
-holiday.en-GB11.date=20160328
+holiday.en-GB11.date=20220101
-holiday.en-GB12.name=Early May Bank Holiday
+holiday.en-GB12.name=New Year's Day (observed)
-holiday.en-GB12.date=20160502
+holiday.en-GB12.date=20220103
-holiday.en-GB13.name=Spring Bank Holiday
+holiday.en-GB13.name=Good Friday
-holiday.en-GB13.date=20160530
+holiday.en-GB13.date=20220415
-holiday.en-GB14.name=August Bank Holiday
+holiday.en-GB14.name=Easter Monday
-holiday.en-GB14.date=20160829
+holiday.en-GB14.date=20220418
-holiday.en-GB15.name=Christmas Day
+holiday.en-GB15.name=Early May Bank Holiday
-holiday.en-GB15.date=20161225
+holiday.en-GB15.date=20220502
-holiday.en-GB16.name=Boxing Day
+holiday.en-GB16.name=Spring Bank Holiday
-holiday.en-GB16.date=20161226
+holiday.en-GB16.date=20220530
 holiday.en-GB17.name=August Bank Holiday
 holiday.en-GB17.date=20220829
 holiday.en-GB18.name=Christmas Day
 holiday.en-GB18.date=20221225
 holiday.en-GB19.name=Boxing Day
 holiday.en-GB19.date=20221226
 holiday.en-GB20.name=Christmas Day (observed)
 holiday.en-GB20.date=20221227
--- a/doc/rc/holidays.en-GL.rc
+++ b/doc/rc/holidays.en-GL.rc
@@ -1,81 +0,0 @@
 ###############################################################################
 # 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
@@ -1,95 +0,0 @@
 ###############################################################################
 # 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
@@ -1,103 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/en-NZ/2015.json
+# https://holidata.net/en-NZ/2021.json
-# http://holidata.net/en-NZ/2016.json
+# https://holidata.net/en-NZ/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,47 +23,61 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-NZ1.name=New Year's Day
-holiday.en-NZ1.date=20150101
+holiday.en-NZ1.date=20210101
-holiday.en-NZ2.name=Day after New Years Day
+holiday.en-NZ2.name=Day after New Year's Day
-holiday.en-NZ2.date=20150102
+holiday.en-NZ2.date=20210104
 holiday.en-NZ3.name=Waitangi Day
-holiday.en-NZ3.date=20150206
+holiday.en-NZ3.date=20210206
-holiday.en-NZ4.name=Good Friday
+holiday.en-NZ4.name=Waitangi Day (observed)
-holiday.en-NZ4.date=20150403
+holiday.en-NZ4.date=20210208
-holiday.en-NZ5.name=Easter Monday
+holiday.en-NZ5.name=Good Friday
-holiday.en-NZ5.date=20150406
+holiday.en-NZ5.date=20210402
-holiday.en-NZ6.name=ANZAC Day
+holiday.en-NZ6.name=Easter Monday
-holiday.en-NZ6.date=20150425
+holiday.en-NZ6.date=20210405
-holiday.en-NZ7.name=Queen's Birthday
+holiday.en-NZ7.name=ANZAC Day
-holiday.en-NZ7.date=20150601
+holiday.en-NZ7.date=20210425
-holiday.en-NZ8.name=Labour Day
+holiday.en-NZ8.name=ANZAC Day (observed)
-holiday.en-NZ8.date=20151026
+holiday.en-NZ8.date=20210426
-holiday.en-NZ9.name=Christmas Day
+holiday.en-NZ9.name=Queen's Birthday
-holiday.en-NZ9.date=20151225
+holiday.en-NZ9.date=20210607
-holiday.en-NZ10.name=Boxing Day
+holiday.en-NZ10.name=Labour Day
-holiday.en-NZ10.date=20151226
+holiday.en-NZ10.date=20211025
-holiday.en-NZ11.name=New Year's Day
+holiday.en-NZ11.name=Christmas Day
-holiday.en-NZ11.date=20160101
+holiday.en-NZ11.date=20211225
-holiday.en-NZ12.name=Day after New Years Day
+holiday.en-NZ12.name=Boxing Day
-holiday.en-NZ12.date=20160104
+holiday.en-NZ12.date=20211226
-holiday.en-NZ13.name=Waitangi Day
+holiday.en-NZ13.name=Christmas Day (observed)
-holiday.en-NZ13.date=20160206
+holiday.en-NZ13.date=20211227
-holiday.en-NZ14.name=Good Friday
+holiday.en-NZ14.name=Boxing Day (observed)
-holiday.en-NZ14.date=20160325
+holiday.en-NZ14.date=20211228
-holiday.en-NZ15.name=Easter Monday
+holiday.en-NZ15.name=New Year's Day
-holiday.en-NZ15.date=20160328
+holiday.en-NZ15.date=20220101
-holiday.en-NZ16.name=ANZAC Day
+holiday.en-NZ16.name=New Year's Day (observed)
-holiday.en-NZ16.date=20160425
+holiday.en-NZ16.date=20220103
-holiday.en-NZ17.name=Queen's Birthday
+holiday.en-NZ17.name=Day after New Year's Day
-holiday.en-NZ17.date=20160606
+holiday.en-NZ17.date=20220104
-holiday.en-NZ18.name=Labour Day
+holiday.en-NZ18.name=Waitangi Day
-holiday.en-NZ18.date=20161024
+holiday.en-NZ18.date=20220206
-holiday.en-NZ19.name=Christmas Day
+holiday.en-NZ19.name=Waitangi Day (observed)
-holiday.en-NZ19.date=20161225
+holiday.en-NZ19.date=20220207
-holiday.en-NZ20.name=Boxing Day
+holiday.en-NZ20.name=Good Friday
-holiday.en-NZ20.date=20161226
+holiday.en-NZ20.date=20220415
 holiday.en-NZ21.name=Easter Monday
 holiday.en-NZ21.date=20220418
 holiday.en-NZ22.name=ANZAC Day
 holiday.en-NZ22.date=20220425
 holiday.en-NZ23.name=Queen's Birthday
 holiday.en-NZ23.date=20220606
 holiday.en-NZ24.name=Labour Day
 holiday.en-NZ24.date=20221024
 holiday.en-NZ25.name=Christmas Day
 holiday.en-NZ25.date=20221225
 holiday.en-NZ26.name=Boxing Day
 holiday.en-NZ26.date=20221226
 holiday.en-NZ27.name=Christmas Day (observed)
 holiday.en-NZ27.date=20221227
--- 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
-# http://holidata.net/en-US/2015.json
+# https://holidata.net/en-US/2021.json
-# http://holidata.net/en-US/2016.json
+# https://holidata.net/en-US/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,51 +23,55 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.en-US1.name=New Year's Day
-holiday.en-US1.date=20150101
+holiday.en-US1.date=20210101
 holiday.en-US2.name=Birthday of Martin Luther King, Jr.
-holiday.en-US2.date=20150119
+holiday.en-US2.date=20210118
 holiday.en-US3.name=Washington's Birthday
-holiday.en-US3.date=20150216
+holiday.en-US3.date=20210215
 holiday.en-US4.name=Patriots' Day
-holiday.en-US4.date=20150420
+holiday.en-US4.date=20210419
 holiday.en-US5.name=Memorial Day
-holiday.en-US5.date=20150525
+holiday.en-US5.date=20210531
 holiday.en-US6.name=Independence Day
-holiday.en-US6.date=20150704
+holiday.en-US6.date=20210704
 holiday.en-US7.name=Labor Day
-holiday.en-US7.date=20150907
+holiday.en-US7.date=20210906
 holiday.en-US8.name=Columbus Day
-holiday.en-US8.date=20151012
+holiday.en-US8.date=20211011
 holiday.en-US9.name=Veterans Day
-holiday.en-US9.date=20151111
+holiday.en-US9.date=20211111
 holiday.en-US10.name=Thanksgiving Day
-holiday.en-US10.date=20151126
+holiday.en-US10.date=20211125
 holiday.en-US11.name=Christmas Day
-holiday.en-US11.date=20151225
+holiday.en-US11.date=20211225
 holiday.en-US12.name=New Year's Day
-holiday.en-US12.date=20160101
+holiday.en-US12.date=20220101
 holiday.en-US13.name=Birthday of Martin Luther King, Jr.
-holiday.en-US13.date=20160118
+holiday.en-US13.date=20220117
 holiday.en-US14.name=Washington's Birthday
-holiday.en-US14.date=20160215
+holiday.en-US14.date=20220221
 holiday.en-US15.name=Patriots' Day
-holiday.en-US15.date=20160418
+holiday.en-US15.date=20220418
 holiday.en-US16.name=Memorial Day
-holiday.en-US16.date=20160530
+holiday.en-US16.date=20220530
 holiday.en-US17.name=Independence Day
-holiday.en-US17.date=20160704
+holiday.en-US17.date=20220704
 holiday.en-US18.name=Labor Day
-holiday.en-US18.date=20160905
+holiday.en-US18.date=20220905
 holiday.en-US19.name=Columbus Day
-holiday.en-US19.date=20161010
+holiday.en-US19.date=20221010
 holiday.en-US20.name=Veterans Day
-holiday.en-US20.date=20161111
+holiday.en-US20.date=20221111
 holiday.en-US21.name=Thanksgiving Day
-holiday.en-US21.date=20161124
+holiday.en-US21.date=20221124
-holiday.en-US22.name=Christmas Day
+holiday.en-US22.name=Day after Thanksgiving
-holiday.en-US22.date=20161225
+holiday.en-US22.date=20221125
 holiday.en-US23.name=Christmas Eve
 holiday.en-US23.date=20221224
 holiday.en-US24.name=Christmas Day
 holiday.en-US24.date=20221225
--- a/doc/rc/holidays.en-ZA.rc
+++ b/doc/rc/holidays.en-ZA.rc
@@ -1,77 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/es-CO/2015.json
+# https://holidata.net/es-CO/2021.json
-# http://holidata.net/es-CO/2016.json
+# https://holidata.net/es-CO/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.es-CO1.name=Año Nuevo
-holiday.es-CO1.date=20150101
+holiday.es-CO1.date=20210101
 holiday.es-CO2.name=Día de los Reyes Magos
-holiday.es-CO2.date=20150112
+holiday.es-CO2.date=20210111
 holiday.es-CO3.name=Día de San José
-holiday.es-CO3.date=20150323
+holiday.es-CO3.date=20210322
 holiday.es-CO4.name=Jueves Santo
-holiday.es-CO4.date=20150402
+holiday.es-CO4.date=20210401
 holiday.es-CO5.name=Viernes Santo
-holiday.es-CO5.date=20150403
+holiday.es-CO5.date=20210402
 holiday.es-CO6.name=Domingo de Pascua
-holiday.es-CO6.date=20150405
+holiday.es-CO6.date=20210404
 holiday.es-CO7.name=Día del Trabajo
-holiday.es-CO7.date=20150501
+holiday.es-CO7.date=20210501
 holiday.es-CO8.name=La Ascensión del Señor
-holiday.es-CO8.date=20150518
+holiday.es-CO8.date=20210517
 holiday.es-CO9.name=Corpus Christi
-holiday.es-CO9.date=20150608
+holiday.es-CO9.date=20210607
 holiday.es-CO10.name=El Sagrado Corazón de Jesús
-holiday.es-CO10.date=20150615
+holiday.es-CO10.date=20210614
 holiday.es-CO11.name=San Pedro y San Pablo
-holiday.es-CO11.date=20150629
+holiday.es-CO11.date=20210705
 holiday.es-CO12.name=Grito de Independencia
-holiday.es-CO12.date=20150720
+holiday.es-CO12.date=20210720
 holiday.es-CO13.name=Batalla de Boyacá
-holiday.es-CO13.date=20150807
+holiday.es-CO13.date=20210807
 holiday.es-CO14.name=Asunción de la Virgen
-holiday.es-CO14.date=20150817
+holiday.es-CO14.date=20210816
 holiday.es-CO15.name=Día de la Raza
-holiday.es-CO15.date=20151012
+holiday.es-CO15.date=20211018
 holiday.es-CO16.name=Todos los Santos
-holiday.es-CO16.date=20151102
+holiday.es-CO16.date=20211101
 holiday.es-CO17.name=Independencia de Cartagena
-holiday.es-CO17.date=20151116
+holiday.es-CO17.date=20211115
 holiday.es-CO18.name=Inmaculada Concepción
-holiday.es-CO18.date=20151208
+holiday.es-CO18.date=20211208
 holiday.es-CO19.name=Navidad
-holiday.es-CO19.date=20151225
+holiday.es-CO19.date=20211225
 holiday.es-CO20.name=Año Nuevo
-holiday.es-CO20.date=20160101
+holiday.es-CO20.date=20220101
 holiday.es-CO21.name=Día de los Reyes Magos
-holiday.es-CO21.date=20160111
+holiday.es-CO21.date=20220110
 holiday.es-CO22.name=Día de San José
-holiday.es-CO22.date=20160321
+holiday.es-CO22.date=20220321
 holiday.es-CO23.name=Jueves Santo
-holiday.es-CO23.date=20160324
+holiday.es-CO23.date=20220414
 holiday.es-CO24.name=Viernes Santo
-holiday.es-CO24.date=20160325
+holiday.es-CO24.date=20220415
 holiday.es-CO25.name=Domingo de Pascua
-holiday.es-CO25.date=20160326
+holiday.es-CO25.date=20220417
 holiday.es-CO26.name=Día del Trabajo
-holiday.es-CO26.date=20160501
+holiday.es-CO26.date=20220501
 holiday.es-CO27.name=La Ascensión del Señor
-holiday.es-CO27.date=20160509
+holiday.es-CO27.date=20220530
 holiday.es-CO28.name=Corpus Christi
-holiday.es-CO28.date=20160530
+holiday.es-CO28.date=20220620
 holiday.es-CO29.name=El Sagrado Corazón de Jesús
-holiday.es-CO29.date=20160606
+holiday.es-CO29.date=20220627
 holiday.es-CO30.name=San Pedro y San Pablo
-holiday.es-CO30.date=20160704
+holiday.es-CO30.date=20220704
 holiday.es-CO31.name=Grito de Independencia
-holiday.es-CO31.date=20160720
+holiday.es-CO31.date=20220720
 holiday.es-CO32.name=Batalla de Boyacá
-holiday.es-CO32.date=20160807
+holiday.es-CO32.date=20220807
 holiday.es-CO33.name=Asunción de la Virgen
-holiday.es-CO33.date=20160815
+holiday.es-CO33.date=20220815
 holiday.es-CO34.name=Día de la Raza
-holiday.es-CO34.date=20161017
+holiday.es-CO34.date=20221017
 holiday.es-CO35.name=Todos los Santos
-holiday.es-CO35.date=20161107
+holiday.es-CO35.date=20221107
 holiday.es-CO36.name=Independencia de Cartagena
-holiday.es-CO36.date=20161114
+holiday.es-CO36.date=20221114
 holiday.es-CO37.name=Inmaculada Concepción
-holiday.es-CO37.date=20161208
+holiday.es-CO37.date=20221208
 holiday.es-CO38.name=Navidad
-holiday.es-CO38.date=20161225
+holiday.es-CO38.date=20221225
--- a/doc/rc/holidays.es-EC.rc
+++ b/doc/rc/holidays.es-EC.rc
@@ -1,75 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/es-ES/2015.json
+# https://holidata.net/es-ES/2021.json
-# http://holidata.net/es-ES/2016.json
+# https://holidata.net/es-ES/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,133 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.es-ES1.name=Año Nuevo
-holiday.es-ES1.date=20150101
+holiday.es-ES1.date=20210101
-holiday.es-ES2.name=Día de los Reyes
+holiday.es-ES2.name=Epifanía del Señor
-holiday.es-ES2.date=20150106
+holiday.es-ES2.date=20210106
-holiday.es-ES3.name=Viernes Santo
+holiday.es-ES3.name=Día de Andalucía
-holiday.es-ES3.date=20150403
+holiday.es-ES3.date=20210301
-holiday.es-ES4.name=Pascua
+holiday.es-ES4.name=Día de las Illes Balears
-holiday.es-ES4.date=20150405
+holiday.es-ES4.date=20210301
-holiday.es-ES5.name=Fiesta del Trabajo
+holiday.es-ES5.name=Estatuto de Autonomía de la Ciudad de Melilla
-holiday.es-ES5.date=20150501
+holiday.es-ES5.date=20210313
-holiday.es-ES6.name=Asunción de la Virgen
+holiday.es-ES6.name=San José
-holiday.es-ES6.date=20150815
+holiday.es-ES6.date=20210319
-holiday.es-ES7.name=Fiesta Nacional de España
+holiday.es-ES7.name=Jueves Santo
-holiday.es-ES7.date=20151012
+holiday.es-ES7.date=20210401
-holiday.es-ES8.name=Dia de todos los Santos
+holiday.es-ES8.name=Viernes Santo
-holiday.es-ES8.date=20151101
+holiday.es-ES8.date=20210402
-holiday.es-ES9.name=Dia de la Constitución
+holiday.es-ES9.name=Pascua
-holiday.es-ES9.date=20151206
+holiday.es-ES9.date=20210404
-holiday.es-ES10.name=Inmaculada Concepción
+holiday.es-ES10.name=Lunes de Pascua
-holiday.es-ES10.date=20151208
+holiday.es-ES10.date=20210405
-holiday.es-ES11.name=Noche Buena
+holiday.es-ES11.name=Fiesta de Castilla y León
-holiday.es-ES11.date=20151224
+holiday.es-ES11.date=20210423
-holiday.es-ES12.name=Navidad
+holiday.es-ES12.name=San Jorge / Día de Aragón
-holiday.es-ES12.date=20151225
+holiday.es-ES12.date=20210423
-holiday.es-ES13.name=Noche Vieja
+holiday.es-ES13.name=Fiesta del Trabajo
-holiday.es-ES13.date=20151231
+holiday.es-ES13.date=20210501
-holiday.es-ES14.name=Año Nuevo
+holiday.es-ES14.name=Lunes siguiente al Día de la Comunidad de Madrid
-holiday.es-ES14.date=20160101
+holiday.es-ES14.date=20210503
-holiday.es-ES15.name=Día de los Reyes
+holiday.es-ES15.name=Día de las Letras Gallegas
-holiday.es-ES15.date=20160106
+holiday.es-ES15.date=20210517
-holiday.es-ES16.name=Viernes Santo
+holiday.es-ES16.name=Día de Castilla-La Mancha
-holiday.es-ES16.date=20160325
+holiday.es-ES16.date=20210531
-holiday.es-ES17.name=Pascua
+holiday.es-ES17.name=Corpus Christi
-holiday.es-ES17.date=20160327
+holiday.es-ES17.date=20210603
-holiday.es-ES18.name=Fiesta del Trabajo
+holiday.es-ES18.name=Día de la Región de Murcia
-holiday.es-ES18.date=20160501
+holiday.es-ES18.date=20210609
-holiday.es-ES19.name=Asunción de la Virgen
+holiday.es-ES19.name=Día de La Rioja
-holiday.es-ES19.date=20160815
+holiday.es-ES19.date=20210609
-holiday.es-ES20.name=Fiesta Nacional de España
+holiday.es-ES20.name=San Juan
-holiday.es-ES20.date=20161012
+holiday.es-ES20.date=20210624
-holiday.es-ES21.name=Dia de todos los Santos
+holiday.es-ES21.name=Fiesta del Sacrificio (Eidul Adha)
-holiday.es-ES21.date=20161101
+holiday.es-ES21.date=20210720
-holiday.es-ES22.name=Dia de la Constitución
+holiday.es-ES22.name=Fiesta del Sacrificio (Aid El Kebir)
-holiday.es-ES22.date=20161206
+holiday.es-ES22.date=20210721
-holiday.es-ES23.name=Inmaculada Concepción
+holiday.es-ES23.name=Santiago Apóstol / Día Nacional de Galicia
-holiday.es-ES23.date=20161208
+holiday.es-ES23.date=20210725
-holiday.es-ES24.name=Noche Buena
+holiday.es-ES24.name=Día de las Instituciones de Cantabria
-holiday.es-ES24.date=20161224
+holiday.es-ES24.date=20210728
-holiday.es-ES25.name=Navidad
+holiday.es-ES25.name=Asunción de la Virgen
-holiday.es-ES25.date=20161225
+holiday.es-ES25.date=20210815
-holiday.es-ES26.name=Noche Vieja
+holiday.es-ES26.name=Lunes siguiente a la Asunción de la Virgen
-holiday.es-ES26.date=20161231
+holiday.es-ES26.date=20210816
 holiday.es-ES27.name=Día de Ceuta
 holiday.es-ES27.date=20210902
 holiday.es-ES28.name=Día de Asturias
 holiday.es-ES28.date=20210908
 holiday.es-ES29.name=Día de Extremadura
 holiday.es-ES29.date=20210908
 holiday.es-ES30.name=Fiesta Nacional de Cataluña
 holiday.es-ES30.date=20210911
 holiday.es-ES31.name=La Bien Aparecida
 holiday.es-ES31.date=20210915
 holiday.es-ES32.name=Día de la Comunitat Valenciana
 holiday.es-ES32.date=20211009
 holiday.es-ES33.name=Fiesta Nacional de España
 holiday.es-ES33.date=20211012
 holiday.es-ES34.name=Todos los Santos
 holiday.es-ES34.date=20211101
 holiday.es-ES35.name=Día de la Constitución Española
 holiday.es-ES35.date=20211206
 holiday.es-ES36.name=Inmaculada Concepción
 holiday.es-ES36.date=20211208
 holiday.es-ES37.name=Natividad del Señor
 holiday.es-ES37.date=20211225
 holiday.es-ES38.name=Año Nuevo
 holiday.es-ES38.date=20220101
 holiday.es-ES39.name=Epifanía del Señor
 holiday.es-ES39.date=20220106
 holiday.es-ES40.name=Día de Andalucía
 holiday.es-ES40.date=20220228
 holiday.es-ES41.name=Estatuto de Autonomía de la Ciudad de Melilla
 holiday.es-ES41.date=20220313
 holiday.es-ES42.name=Viernes Santo
 holiday.es-ES42.date=20220415
 holiday.es-ES43.name=Pascua
 holiday.es-ES43.date=20220417
 holiday.es-ES44.name=Fiesta de Castilla y León
 holiday.es-ES44.date=20220423
 holiday.es-ES45.name=San Jorge / Día de Aragón
 holiday.es-ES45.date=20220423
 holiday.es-ES46.name=Fiesta del Trabajo
 holiday.es-ES46.date=20220501
 holiday.es-ES47.name=Fiesta de la Comunidad de Madrid
 holiday.es-ES47.date=20220502
 holiday.es-ES48.name=Día de las Letras Gallegas
 holiday.es-ES48.date=20220517
 holiday.es-ES49.name=Día de Canarias
 holiday.es-ES49.date=20220530
 holiday.es-ES50.name=Día de Castilla-La Mancha
 holiday.es-ES50.date=20220531
 holiday.es-ES51.name=Día de la Región de Murcia
 holiday.es-ES51.date=20220609
 holiday.es-ES52.name=Día de La Rioja
 holiday.es-ES52.date=20220609
 holiday.es-ES53.name=Santiago Apóstol / Día Nacional de Galicia
 holiday.es-ES53.date=20220725
 holiday.es-ES54.name=Asunción de la Virgen
 holiday.es-ES54.date=20220815
 holiday.es-ES55.name=Día de Asturias
 holiday.es-ES55.date=20220908
 holiday.es-ES56.name=Día de Extremadura
 holiday.es-ES56.date=20220908
 holiday.es-ES57.name=Fiesta Nacional de Cataluña
 holiday.es-ES57.date=20220911
 holiday.es-ES58.name=Día de la Comunitat Valenciana
 holiday.es-ES58.date=20221009
 holiday.es-ES59.name=Fiesta Nacional de España
 holiday.es-ES59.date=20221012
 holiday.es-ES60.name=Todos los Santos
 holiday.es-ES60.date=20221101
 holiday.es-ES61.name=Día de la Constitución Española
 holiday.es-ES61.date=20221206
 holiday.es-ES62.name=Inmaculada Concepción
 holiday.es-ES62.date=20221208
 holiday.es-ES63.name=Natividad del Señor
 holiday.es-ES63.date=20221225
--- a/doc/rc/holidays.es-MX.rc
+++ b/doc/rc/holidays.es-MX.rc
@@ -1,69 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/es-US/2015.json
+# https://holidata.net/es-US/2021.json
-# http://holidata.net/es-US/2016.json
+# https://holidata.net/es-US/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,51 +23,55 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.es-US1.name=Año Neuvo
-holiday.es-US1.date=20150101
+holiday.es-US1.date=20210101
 holiday.es-US2.name=Cumpleaños de Martin Luther King, Jr.
-holiday.es-US2.date=20150119
+holiday.es-US2.date=20210118
 holiday.es-US3.name=Día del Presidente
-holiday.es-US3.date=20150216
+holiday.es-US3.date=20210215
 holiday.es-US4.name=Día del Patriota
-holiday.es-US4.date=20150420
+holiday.es-US4.date=20210419
 holiday.es-US5.name=Día de los Caídos
-holiday.es-US5.date=20150525
+holiday.es-US5.date=20210531
 holiday.es-US6.name=Día de la Independiencia
-holiday.es-US6.date=20150704
+holiday.es-US6.date=20210704
 holiday.es-US7.name=Día del Trabajo
-holiday.es-US7.date=20150907
+holiday.es-US7.date=20210906
 holiday.es-US8.name=Día de Columbus
-holiday.es-US8.date=20151012
+holiday.es-US8.date=20211011
 holiday.es-US9.name=Día de los Veteranos
-holiday.es-US9.date=20151111
+holiday.es-US9.date=20211111
 holiday.es-US10.name=Día de Acción de Gracias
-holiday.es-US10.date=20151126
+holiday.es-US10.date=20211125
 holiday.es-US11.name=Navidad
-holiday.es-US11.date=20151225
+holiday.es-US11.date=20211225
 holiday.es-US12.name=Año Neuvo
-holiday.es-US12.date=20160101
+holiday.es-US12.date=20220101
 holiday.es-US13.name=Cumpleaños de Martin Luther King, Jr.
-holiday.es-US13.date=20160118
+holiday.es-US13.date=20220117
 holiday.es-US14.name=Día del Presidente
-holiday.es-US14.date=20160215
+holiday.es-US14.date=20220221
 holiday.es-US15.name=Día del Patriota
-holiday.es-US15.date=20160418
+holiday.es-US15.date=20220418
 holiday.es-US16.name=Día de los Caídos
-holiday.es-US16.date=20160530
+holiday.es-US16.date=20220530
 holiday.es-US17.name=Día de la Independiencia
-holiday.es-US17.date=20160704
+holiday.es-US17.date=20220704
 holiday.es-US18.name=Día del Trabajo
-holiday.es-US18.date=20160905
+holiday.es-US18.date=20220905
 holiday.es-US19.name=Día de Columbus
-holiday.es-US19.date=20161010
+holiday.es-US19.date=20221010
 holiday.es-US20.name=Día de los Veteranos
-holiday.es-US20.date=20161111
+holiday.es-US20.date=20221111
 holiday.es-US21.name=Día de Acción de Gracias
-holiday.es-US21.date=20161124
+holiday.es-US21.date=20221124
-holiday.es-US22.name=Navidad
+holiday.es-US22.name=Día después de Acción de Gracias
-holiday.es-US22.date=20161225
+holiday.es-US22.date=20221125
 holiday.es-US23.name=Nochebuena
 holiday.es-US23.date=20221224
 holiday.es-US24.name=Navidad
 holiday.es-US24.date=20221225
--- a/doc/rc/holidays.et-EE.rc
+++ b/doc/rc/holidays.et-EE.rc
@@ -1,77 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/fi-FI/2015.json
+# https://holidata.net/fi-FI/2021.json
-# http://holidata.net/fi-FI/2016.json
+# https://holidata.net/fi-FI/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,59 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.fi-FI1.name=Uudenvuodenpäivä
-holiday.fi-FI1.date=20150101
+holiday.fi-FI1.date=20210101
 holiday.fi-FI2.name=Loppiainen
-holiday.fi-FI2.date=20150106
+holiday.fi-FI2.date=20210106
 holiday.fi-FI3.name=Pitkäperjantai
-holiday.fi-FI3.date=20150403
+holiday.fi-FI3.date=20210402
 holiday.fi-FI4.name=Pääsiäispäivä
-holiday.fi-FI4.date=20150405
+holiday.fi-FI4.date=20210404
 holiday.fi-FI5.name=2. pääsiäispäivä
-holiday.fi-FI5.date=20150406
+holiday.fi-FI5.date=20210405
 holiday.fi-FI6.name=Vappu
-holiday.fi-FI6.date=20150501
+holiday.fi-FI6.date=20210501
 holiday.fi-FI7.name=Helatorstai
-holiday.fi-FI7.date=20150514
+holiday.fi-FI7.date=20210513
 holiday.fi-FI8.name=Helluntaipäivä
-holiday.fi-FI8.date=20150524
+holiday.fi-FI8.date=20210523
-holiday.fi-FI9.name=Juhannusaatto
+holiday.fi-FI9.name=Juhannuspäivä
-holiday.fi-FI9.date=20150619
+holiday.fi-FI9.date=20210626
-holiday.fi-FI10.name=Juhannuspäivä
+holiday.fi-FI10.name=Pyhäinpäivä
-holiday.fi-FI10.date=20150620
+holiday.fi-FI10.date=20211106
-holiday.fi-FI11.name=Pyhäinpäivä
+holiday.fi-FI11.name=Itsenäisyyspäivä
-holiday.fi-FI11.date=20151031
+holiday.fi-FI11.date=20211206
-holiday.fi-FI12.name=Itsenäisyyspäivä
+holiday.fi-FI12.name=Joulupäivä
-holiday.fi-FI12.date=20151206
+holiday.fi-FI12.date=20211225
-holiday.fi-FI13.name=Jouluaatto
+holiday.fi-FI13.name=Tapaninpäivä
-holiday.fi-FI13.date=20151224
+holiday.fi-FI13.date=20211226
-holiday.fi-FI14.name=Joulupäivä
+holiday.fi-FI14.name=Uudenvuodenpäivä
-holiday.fi-FI14.date=20151225
+holiday.fi-FI14.date=20220101
-holiday.fi-FI15.name=2. joulupäivä
+holiday.fi-FI15.name=Loppiainen
-holiday.fi-FI15.date=20151226
+holiday.fi-FI15.date=20220106
-holiday.fi-FI16.name=Uudenvuodenpäivä
+holiday.fi-FI16.name=Pitkäperjantai
-holiday.fi-FI16.date=20160101
+holiday.fi-FI16.date=20220415
-holiday.fi-FI17.name=Loppiainen
+holiday.fi-FI17.name=Pääsiäispäivä
-holiday.fi-FI17.date=20160106
+holiday.fi-FI17.date=20220417
-holiday.fi-FI18.name=Pitkäperjantai
+holiday.fi-FI18.name=2. pääsiäispäivä
-holiday.fi-FI18.date=20160325
+holiday.fi-FI18.date=20220418
-holiday.fi-FI19.name=Pääsiäispäivä
+holiday.fi-FI19.name=Vappu
-holiday.fi-FI19.date=20160327
+holiday.fi-FI19.date=20220501
-holiday.fi-FI20.name=2. pääsiäispäivä
+holiday.fi-FI20.name=Helatorstai
-holiday.fi-FI20.date=20160328
+holiday.fi-FI20.date=20220526
-holiday.fi-FI21.name=Vappu
+holiday.fi-FI21.name=Helluntaipäivä
-holiday.fi-FI21.date=20160501
+holiday.fi-FI21.date=20220605
-holiday.fi-FI22.name=Helatorstai
+holiday.fi-FI22.name=Juhannuspäivä
-holiday.fi-FI22.date=20160505
+holiday.fi-FI22.date=20220625
-holiday.fi-FI23.name=Helluntaipäivä
+holiday.fi-FI23.name=Pyhäinpäivä
-holiday.fi-FI23.date=20160515
+holiday.fi-FI23.date=20221105
-holiday.fi-FI24.name=Juhannusaatto
+holiday.fi-FI24.name=Itsenäisyyspäivä
-holiday.fi-FI24.date=20160624
+holiday.fi-FI24.date=20221206
-holiday.fi-FI25.name=Juhannuspäivä
+holiday.fi-FI25.name=Joulupäivä
-holiday.fi-FI25.date=20160625
+holiday.fi-FI25.date=20221225
-holiday.fi-FI26.name=Pyhäinpäivä
+holiday.fi-FI26.name=Tapaninpäivä
-holiday.fi-FI26.date=20161105
+holiday.fi-FI26.date=20221226
 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
-# http://holidata.net/fr-BE/2015.json
+# https://holidata.net/fr-BE/2021.json
-# http://holidata.net/fr-BE/2016.json
+# https://holidata.net/fr-BE/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.fr-BE1.name=Nouvel An
-holiday.fr-BE1.date=20150101
+holiday.fr-BE1.date=20210101
 holiday.fr-BE2.name=Pâques
-holiday.fr-BE2.date=20150405
+holiday.fr-BE2.date=20210404
 holiday.fr-BE3.name=Lundi de Pâques
-holiday.fr-BE3.date=20150406
+holiday.fr-BE3.date=20210405
 holiday.fr-BE4.name=Fête du Travail
-holiday.fr-BE4.date=20150501
+holiday.fr-BE4.date=20210501
 holiday.fr-BE5.name=Ascension
-holiday.fr-BE5.date=20150514
+holiday.fr-BE5.date=20210513
 holiday.fr-BE6.name=Pentecôte
-holiday.fr-BE6.date=20150524
+holiday.fr-BE6.date=20210523
 holiday.fr-BE7.name=Lundi de Pentecôte
-holiday.fr-BE7.date=20150525
+holiday.fr-BE7.date=20210524
 holiday.fr-BE8.name=Fête nationale
-holiday.fr-BE8.date=20150721
+holiday.fr-BE8.date=20210721
 holiday.fr-BE9.name=Assomption
-holiday.fr-BE9.date=20150815
+holiday.fr-BE9.date=20210815
 holiday.fr-BE10.name=Toussaint
-holiday.fr-BE10.date=20151101
+holiday.fr-BE10.date=20211101
 holiday.fr-BE11.name=Jour de l'armistice
-holiday.fr-BE11.date=20151111
+holiday.fr-BE11.date=20211111
 holiday.fr-BE12.name=Noël
-holiday.fr-BE12.date=20151225
+holiday.fr-BE12.date=20211225
 holiday.fr-BE13.name=Nouvel An
-holiday.fr-BE13.date=20160101
+holiday.fr-BE13.date=20220101
 holiday.fr-BE14.name=Pâques
-holiday.fr-BE14.date=20160527
+holiday.fr-BE14.date=20220417
 holiday.fr-BE15.name=Lundi de Pâques
-holiday.fr-BE15.date=20160528
+holiday.fr-BE15.date=20220418
 holiday.fr-BE16.name=Fête du Travail
-holiday.fr-BE16.date=20160501
+holiday.fr-BE16.date=20220501
 holiday.fr-BE17.name=Ascension
-holiday.fr-BE17.date=20160505
+holiday.fr-BE17.date=20220526
 holiday.fr-BE18.name=Pentecôte
-holiday.fr-BE18.date=20160515
+holiday.fr-BE18.date=20220605
 holiday.fr-BE19.name=Lundi de Pentecôte
-holiday.fr-BE19.date=20160516
+holiday.fr-BE19.date=20220606
 holiday.fr-BE20.name=Fête nationale
-holiday.fr-BE20.date=20160721
+holiday.fr-BE20.date=20220721
 holiday.fr-BE21.name=Assomption
-holiday.fr-BE21.date=20160815
+holiday.fr-BE21.date=20220815
 holiday.fr-BE22.name=Toussaint
-holiday.fr-BE22.date=20161101
+holiday.fr-BE22.date=20221101
 holiday.fr-BE23.name=Jour de l'armistice
-holiday.fr-BE23.date=20161111
+holiday.fr-BE23.date=20221111
 holiday.fr-BE24.name=Noël
-holiday.fr-BE24.date=20161225
+holiday.fr-BE24.date=20221225
--- a/doc/rc/holidays.fr-CA.rc
+++ b/doc/rc/holidays.fr-CA.rc
@@ -0,0 +1,109 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # https://holidata.net/fr-CA/2021.json
 # https://holidata.net/fr-CA/2022.json
 #
 # Copyright 2006 - 2021, Tomas Babej, 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.
 #
 # https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.fr-CA1.name=Jour de l'An
 holiday.fr-CA1.date=20210101
 holiday.fr-CA2.name=Fête de la Famille
 holiday.fr-CA2.date=20210215
 holiday.fr-CA3.name=Journée Louis Riel
 holiday.fr-CA3.date=20210215
 holiday.fr-CA4.name=Fête des Insulaires
 holiday.fr-CA4.date=20210215
 holiday.fr-CA5.name=Vendredi Saint
 holiday.fr-CA5.date=20210402
 holiday.fr-CA6.name=Lundi de Pâques
 holiday.fr-CA6.date=20210405
 holiday.fr-CA7.name=Fête de la Reine Victoria
 holiday.fr-CA7.date=20210524
 holiday.fr-CA8.name=Journée Nationale des Patriotes
 holiday.fr-CA8.date=20210524
 holiday.fr-CA9.name=Fête Nationale
 holiday.fr-CA9.date=20210624
 holiday.fr-CA10.name=Fête du Canada
 holiday.fr-CA10.date=20210701
 holiday.fr-CA11.name=Premier lundi d'août
 holiday.fr-CA11.date=20210802
 holiday.fr-CA12.name=Fête du Patrimoine
 holiday.fr-CA12.date=20210802
 holiday.fr-CA13.name=Fête de la Saskatchewan
 holiday.fr-CA13.date=20210802
 holiday.fr-CA14.name=Jour de la Fondation
 holiday.fr-CA14.date=20210802
 holiday.fr-CA15.name=Jour du Nouveau-Brunswick
 holiday.fr-CA15.date=20210802
 holiday.fr-CA16.name=Fête du Travail
 holiday.fr-CA16.date=20210906
 holiday.fr-CA17.name=Jour de l'Action de grâce
 holiday.fr-CA17.date=20211011
 holiday.fr-CA18.name=Jour du Souvenir
 holiday.fr-CA18.date=20211111
 holiday.fr-CA19.name=Jour de Noël
 holiday.fr-CA19.date=20211225
 holiday.fr-CA20.name=Lendemain de Noël
 holiday.fr-CA20.date=20211226
 holiday.fr-CA21.name=Jour de l'An
 holiday.fr-CA21.date=20220101
 holiday.fr-CA22.name=Fête de la Famille
 holiday.fr-CA22.date=20220221
 holiday.fr-CA23.name=Journée Louis Riel
 holiday.fr-CA23.date=20220221
 holiday.fr-CA24.name=Fête des Insulaires
 holiday.fr-CA24.date=20220221
 holiday.fr-CA25.name=Vendredi Saint
 holiday.fr-CA25.date=20220415
 holiday.fr-CA26.name=Lundi de Pâques
 holiday.fr-CA26.date=20220418
 holiday.fr-CA27.name=Fête de la Reine Victoria
 holiday.fr-CA27.date=20220523
 holiday.fr-CA28.name=Journée Nationale des Patriotes
 holiday.fr-CA28.date=20220523
 holiday.fr-CA29.name=Fête Nationale
 holiday.fr-CA29.date=20220624
 holiday.fr-CA30.name=Fête du Canada
 holiday.fr-CA30.date=20220701
 holiday.fr-CA31.name=Premier lundi d'août
 holiday.fr-CA31.date=20220801
 holiday.fr-CA32.name=Fête du Patrimoine
 holiday.fr-CA32.date=20220801
 holiday.fr-CA33.name=Fête de la Saskatchewan
 holiday.fr-CA33.date=20220801
 holiday.fr-CA34.name=Jour de la Fondation
 holiday.fr-CA34.date=20220801
 holiday.fr-CA35.name=Jour du Nouveau-Brunswick
 holiday.fr-CA35.date=20220801
 holiday.fr-CA36.name=Fête du Travail
 holiday.fr-CA36.date=20220905
 holiday.fr-CA37.name=Jour de l'Action de grâce
 holiday.fr-CA37.date=20221010
 holiday.fr-CA38.name=Jour du Souvenir
 holiday.fr-CA38.date=20221111
 holiday.fr-CA39.name=Jour de Noël
 holiday.fr-CA39.date=20221225
 holiday.fr-CA40.name=Lendemain de Noël
 holiday.fr-CA40.date=20221226
--- 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
-# http://holidata.net/fr-FR/2015.json
+# https://holidata.net/fr-FR/2021.json
-# http://holidata.net/fr-FR/2016.json
+# https://holidata.net/fr-FR/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,51 +23,55 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.fr-FR1.name=Jour de l'an
-holiday.fr-FR1.date=20150101
+holiday.fr-FR1.date=20210101
 holiday.fr-FR2.name=Lundi de Pâques
-holiday.fr-FR2.date=20150406
+holiday.fr-FR2.date=20210405
 holiday.fr-FR3.name=Fête du premier mai
-holiday.fr-FR3.date=20150501
+holiday.fr-FR3.date=20210501
 holiday.fr-FR4.name=Armistice 1945
-holiday.fr-FR4.date=20150508
+holiday.fr-FR4.date=20210508
-holiday.fr-FR5.name=Ascencion
+holiday.fr-FR5.name=Ascension
-holiday.fr-FR5.date=20150514
+holiday.fr-FR5.date=20210513
 holiday.fr-FR6.name=Pentecôte
-holiday.fr-FR6.date=20150524
+holiday.fr-FR6.date=20210523
-holiday.fr-FR7.name=Fête nationale
+holiday.fr-FR7.name=Lundi de Pentecôte
-holiday.fr-FR7.date=20150714
+holiday.fr-FR7.date=20210524
-holiday.fr-FR8.name=Assomption
+holiday.fr-FR8.name=Fête nationale
-holiday.fr-FR8.date=20150815
+holiday.fr-FR8.date=20210714
-holiday.fr-FR9.name=Toussaint
+holiday.fr-FR9.name=Assomption
-holiday.fr-FR9.date=20151101
+holiday.fr-FR9.date=20210815
-holiday.fr-FR10.name=Armistice 1918
+holiday.fr-FR10.name=Toussaint
-holiday.fr-FR10.date=20151111
+holiday.fr-FR10.date=20211101
-holiday.fr-FR11.name=Noël
+holiday.fr-FR11.name=Armistice 1918
-holiday.fr-FR11.date=20151225
+holiday.fr-FR11.date=20211111
-holiday.fr-FR12.name=Jour de l'an
+holiday.fr-FR12.name=Noël
-holiday.fr-FR12.date=20160101
+holiday.fr-FR12.date=20211225
-holiday.fr-FR13.name=Lundi de Pâques
+holiday.fr-FR13.name=Jour de l'an
-holiday.fr-FR13.date=20160328
+holiday.fr-FR13.date=20220101
-holiday.fr-FR14.name=Fête du premier mai
+holiday.fr-FR14.name=Lundi de Pâques
-holiday.fr-FR14.date=20160501
+holiday.fr-FR14.date=20220418
-holiday.fr-FR15.name=Armistice 1945
+holiday.fr-FR15.name=Fête du premier mai
-holiday.fr-FR15.date=20160508
+holiday.fr-FR15.date=20220501
-holiday.fr-FR16.name=Ascencion
+holiday.fr-FR16.name=Armistice 1945
-holiday.fr-FR16.date=20160505
+holiday.fr-FR16.date=20220508
-holiday.fr-FR17.name=Pentecôte
+holiday.fr-FR17.name=Ascension
-holiday.fr-FR17.date=20160515
+holiday.fr-FR17.date=20220526
-holiday.fr-FR18.name=Fête nationale
+holiday.fr-FR18.name=Pentecôte
-holiday.fr-FR18.date=20160714
+holiday.fr-FR18.date=20220605
-holiday.fr-FR19.name=Assomption
+holiday.fr-FR19.name=Lundi de Pentecôte
-holiday.fr-FR19.date=20160815
+holiday.fr-FR19.date=20220606
-holiday.fr-FR20.name=Toussaint
+holiday.fr-FR20.name=Fête nationale
-holiday.fr-FR20.date=20161101
+holiday.fr-FR20.date=20220714
-holiday.fr-FR21.name=Armistice 1918
+holiday.fr-FR21.name=Assomption
-holiday.fr-FR21.date=20161111
+holiday.fr-FR21.date=20220815
-holiday.fr-FR22.name=Noël
+holiday.fr-FR22.name=Toussaint
-holiday.fr-FR22.date=20161225
+holiday.fr-FR22.date=20221101
 holiday.fr-FR23.name=Armistice 1918
 holiday.fr-FR23.date=20221111
 holiday.fr-FR24.name=Noël
 holiday.fr-FR24.date=20221225
--- a/doc/rc/holidays.ga-IE.rc
+++ b/doc/rc/holidays.ga-IE.rc
@@ -1,65 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/hr-HR/2015.json
+# https://holidata.net/hr-HR/2021.json
-# http://holidata.net/hr-HR/2016.json
+# https://holidata.net/hr-HR/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,65 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.hr-HR1.name=Nova Godina
-holiday.hr-HR1.date=20150101
+holiday.hr-HR1.date=20210101
 holiday.hr-HR2.name=Bogojavljenje
-holiday.hr-HR2.date=20150106
+holiday.hr-HR2.date=20210106
 holiday.hr-HR3.name=Uskrs
-holiday.hr-HR3.date=20150405
+holiday.hr-HR3.date=20210404
 holiday.hr-HR4.name=Uskrsni ponedjeljak
-holiday.hr-HR4.date=20150406
+holiday.hr-HR4.date=20210405
-holiday.hr-HR5.name=Međunarodni praznik rada
+holiday.hr-HR5.name=Praznik rada
-holiday.hr-HR5.date=20150501
+holiday.hr-HR5.date=20210501
 holiday.hr-HR6.name=Tijelovo
-holiday.hr-HR6.date=20150604
+holiday.hr-HR6.date=20210603
 holiday.hr-HR7.name=Dan antifašističke borbe
-holiday.hr-HR7.date=20150622
+holiday.hr-HR7.date=20210622
 holiday.hr-HR8.name=Dan državnosti
-holiday.hr-HR8.date=20150625
+holiday.hr-HR8.date=20210625
-holiday.hr-HR9.name=Dan pobjede
+holiday.hr-HR9.name=Dan pobjede i domovinske zahvalnosti i Dan hrvatskih branitelja
-holiday.hr-HR9.date=20150805
+holiday.hr-HR9.date=20210805
 holiday.hr-HR10.name=Velika Gospa
-holiday.hr-HR10.date=20150815
+holiday.hr-HR10.date=20210815
 holiday.hr-HR11.name=Dan neovisnosti
-holiday.hr-HR11.date=20151008
+holiday.hr-HR11.date=20211008
-holiday.hr-HR12.name=Dan svih svetih
+holiday.hr-HR12.name=Svi sveti
-holiday.hr-HR12.date=20151101
+holiday.hr-HR12.date=20211101
-holiday.hr-HR13.name=Božić
+holiday.hr-HR13.name=Dan sjećanja na žrtve Domovinskog rata i Dan sjećanja na žrtvu Vukovara i Škabrnje
-holiday.hr-HR13.date=20151225
+holiday.hr-HR13.date=20211118
-holiday.hr-HR14.name=Prvi dan po Božiću
+holiday.hr-HR14.name=Božić
-holiday.hr-HR14.date=20151226
+holiday.hr-HR14.date=20211225
-holiday.hr-HR15.name=Nova Godina
+holiday.hr-HR15.name=Sveti Stjepan
-holiday.hr-HR15.date=20160101
+holiday.hr-HR15.date=20211226
-holiday.hr-HR16.name=Bogojavljenje
+holiday.hr-HR16.name=Nova Godina
-holiday.hr-HR16.date=20160106
+holiday.hr-HR16.date=20220101
-holiday.hr-HR17.name=Uskrs
+holiday.hr-HR17.name=Sveta tri kralja
-holiday.hr-HR17.date=20160327
+holiday.hr-HR17.date=20220106
-holiday.hr-HR18.name=Uskrsni ponedjeljak
+holiday.hr-HR18.name=Uskrs
-holiday.hr-HR18.date=20160328
+holiday.hr-HR18.date=20220417
-holiday.hr-HR19.name=Međunarodni praznik rada
+holiday.hr-HR19.name=Uskršnji ponedjeljak
-holiday.hr-HR19.date=20160501
+holiday.hr-HR19.date=20220418
-holiday.hr-HR20.name=Tijelovo
+holiday.hr-HR20.name=Praznik rada
-holiday.hr-HR20.date=20160526
+holiday.hr-HR20.date=20220501
-holiday.hr-HR21.name=Dan antifašističke borbe
+holiday.hr-HR21.name=Dan državnosti
-holiday.hr-HR21.date=20160622
+holiday.hr-HR21.date=20220530
-holiday.hr-HR22.name=Dan državnosti
+holiday.hr-HR22.name=Tijelovo
-holiday.hr-HR22.date=20160625
+holiday.hr-HR22.date=20220616
-holiday.hr-HR23.name=Dan pobjede
+holiday.hr-HR23.name=Dan antifašističke borbe
-holiday.hr-HR23.date=20160805
+holiday.hr-HR23.date=20220622
-holiday.hr-HR24.name=Velika Gospa
+holiday.hr-HR24.name=Dan pobjede i domovinske zahvalnosti i Dan hrvatskih branitelja
-holiday.hr-HR24.date=20160815
+holiday.hr-HR24.date=20220805
-holiday.hr-HR25.name=Dan neovisnosti
+holiday.hr-HR25.name=Velika Gospa
-holiday.hr-HR25.date=20161008
+holiday.hr-HR25.date=20220815
 holiday.hr-HR26.name=Dan svih svetih
-holiday.hr-HR26.date=20161101
+holiday.hr-HR26.date=20221101
-holiday.hr-HR27.name=Božić
+holiday.hr-HR27.name=Dan sjećanja na žrtve Domovinskog rata i Dan sjećanja na žrtvu Vukovara i Škabrnje
-holiday.hr-HR27.date=20161225
+holiday.hr-HR27.date=20221118
-holiday.hr-HR28.name=Prvi dan po Božiću
+holiday.hr-HR28.name=Božić
-holiday.hr-HR28.date=20161226
+holiday.hr-HR28.date=20221225
 holiday.hr-HR29.name=Sveti Stjepan
 holiday.hr-HR29.date=20221226
--- a/doc/rc/holidays.hu-HU.rc
+++ b/doc/rc/holidays.hu-HU.rc
@@ -0,0 +1,83 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # https://holidata.net/hu-HU/2021.json
 # https://holidata.net/hu-HU/2022.json
 #
 # Copyright 2006 - 2021, Tomas Babej, 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.
 #
 # https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.hu-HU1.name=Újév
 holiday.hu-HU1.date=20210101
 holiday.hu-HU2.name=Az 1848-as forradalom ünnepe
 holiday.hu-HU2.date=20210315
 holiday.hu-HU3.name=Nagypéntek
 holiday.hu-HU3.date=20210402
 holiday.hu-HU4.name=Húsvét
 holiday.hu-HU4.date=20210404
 holiday.hu-HU5.name=Húsvéthétfő
 holiday.hu-HU5.date=20210405
 holiday.hu-HU6.name=A munka ünnepe
 holiday.hu-HU6.date=20210501
 holiday.hu-HU7.name=Pünkösd
 holiday.hu-HU7.date=20210523
 holiday.hu-HU8.name=Pünkösdhétfő
 holiday.hu-HU8.date=20210524
 holiday.hu-HU9.name=Az államalapítás ünnepe
 holiday.hu-HU9.date=20210820
 holiday.hu-HU10.name=Az 1956-os forradalom ünnepe
 holiday.hu-HU10.date=20211023
 holiday.hu-HU11.name=Mindenszentek
 holiday.hu-HU11.date=20211101
 holiday.hu-HU12.name=Munkaszüneti Nap
 holiday.hu-HU12.date=20211224
 holiday.hu-HU13.name=Karácsony
 holiday.hu-HU13.date=20211225
 holiday.hu-HU14.name=Karácsony
 holiday.hu-HU14.date=20211226
 holiday.hu-HU15.name=Újév
 holiday.hu-HU15.date=20220101
 holiday.hu-HU16.name=Az 1848-as forradalom ünnepe
 holiday.hu-HU16.date=20220315
 holiday.hu-HU17.name=Nagypéntek
 holiday.hu-HU17.date=20220415
 holiday.hu-HU18.name=Húsvét
 holiday.hu-HU18.date=20220417
 holiday.hu-HU19.name=Húsvéthétfő
 holiday.hu-HU19.date=20220418
 holiday.hu-HU20.name=A munka ünnepe
 holiday.hu-HU20.date=20220501
 holiday.hu-HU21.name=Pünkösd
 holiday.hu-HU21.date=20220605
 holiday.hu-HU22.name=Pünkösdhétfő
 holiday.hu-HU22.date=20220606
 holiday.hu-HU23.name=Az államalapítás ünnepe
 holiday.hu-HU23.date=20220820
 holiday.hu-HU24.name=Az 1956-os forradalom ünnepe
 holiday.hu-HU24.date=20221023
 holiday.hu-HU25.name=Mindenszentek
 holiday.hu-HU25.date=20221101
 holiday.hu-HU26.name=Karácsony
 holiday.hu-HU26.date=20221225
 holiday.hu-HU27.name=Karácsony
 holiday.hu-HU27.date=20221226
--- 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
-# http://holidata.net/is-IS/2015.json
+# https://holidata.net/is-IS/2021.json
-# http://holidata.net/is-IS/2016.json
+# https://holidata.net/is-IS/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,71 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.is-IS1.name=Nýársdagur
-holiday.is-IS1.date=20150101
+holiday.is-IS1.date=20210101
 holiday.is-IS2.name=Skírdagur
-holiday.is-IS2.date=20150402
+holiday.is-IS2.date=20210401
-holiday.is-IS3.name=Föstudaginn langi
+holiday.is-IS3.name=Föstudagurinn langi
-holiday.is-IS3.date=20150403
+holiday.is-IS3.date=20210402
 holiday.is-IS4.name=Páskadagur
-holiday.is-IS4.date=20150405
+holiday.is-IS4.date=20210404
-holiday.is-IS5.name=Annar í páskum
+holiday.is-IS5.name=Annar dagur páska
-holiday.is-IS5.date=20150406
+holiday.is-IS5.date=20210405
 holiday.is-IS6.name=Sumardagurinn fyrsti
-holiday.is-IS6.date=20150423
+holiday.is-IS6.date=20210422
 holiday.is-IS7.name=Verkalýðsdagurinn
-holiday.is-IS7.date=20150501
+holiday.is-IS7.date=20210501
 holiday.is-IS8.name=Uppstigningardagur
-holiday.is-IS8.date=20150514
+holiday.is-IS8.date=20210513
-holiday.is-IS9.name=Annar í hvítasunnu
+holiday.is-IS9.name=Hvítasunnudagur
-holiday.is-IS9.date=20150525
+holiday.is-IS9.date=20210523
-holiday.is-IS10.name=Lýðveldisdagurinn
+holiday.is-IS10.name=Annar dagur hvítasunnu
-holiday.is-IS10.date=20150617
+holiday.is-IS10.date=20210524
-holiday.is-IS11.name=Frídagur verslunarmanna
+holiday.is-IS11.name=Þjóðhátíðardagurinn
-holiday.is-IS11.date=20150803
+holiday.is-IS11.date=20210617
-holiday.is-IS12.name=Jól
+holiday.is-IS12.name=Frídagur verslunarmanna
-holiday.is-IS12.date=20151224
+holiday.is-IS12.date=20210802
-holiday.is-IS13.name=Jól
+holiday.is-IS13.name=Aðfangadagur jóla
-holiday.is-IS13.date=20151225
+holiday.is-IS13.date=20211224
-holiday.is-IS14.name=Jól
+holiday.is-IS14.name=Jóladagur
-holiday.is-IS14.date=20151226
+holiday.is-IS14.date=20211225
-holiday.is-IS15.name=Gamlárskvöld
+holiday.is-IS15.name=Annar dagur jóla
-holiday.is-IS15.date=20151231
+holiday.is-IS15.date=20211226
-holiday.is-IS16.name=Nýársdagur
+holiday.is-IS16.name=Gamlársdagur
-holiday.is-IS16.date=20160101
+holiday.is-IS16.date=20211231
-holiday.is-IS17.name=Skírdagur
+holiday.is-IS17.name=Nýársdagur
-holiday.is-IS17.date=20160324
+holiday.is-IS17.date=20220101
-holiday.is-IS18.name=Föstudaginn langi
+holiday.is-IS18.name=Skírdagur
-holiday.is-IS18.date=20160325
+holiday.is-IS18.date=20220414
-holiday.is-IS19.name=Páskadagur
+holiday.is-IS19.name=Föstudagurinn langi
-holiday.is-IS19.date=20160327
+holiday.is-IS19.date=20220415
-holiday.is-IS20.name=Annar í páskum
+holiday.is-IS20.name=Páskadagur
-holiday.is-IS20.date=20160328
+holiday.is-IS20.date=20220417
-holiday.is-IS21.name=Sumardagurinn fyrsti
+holiday.is-IS21.name=Annar dagur páska
-holiday.is-IS21.date=20160421
+holiday.is-IS21.date=20220418
-holiday.is-IS22.name=Verkalýðsdagurinn
+holiday.is-IS22.name=Sumardagurinn fyrsti
-holiday.is-IS22.date=20160501
+holiday.is-IS22.date=20220421
-holiday.is-IS23.name=Uppstigningardagur
+holiday.is-IS23.name=Verkalýðsdagurinn
-holiday.is-IS23.date=20160505
+holiday.is-IS23.date=20220501
-holiday.is-IS24.name=Annar í hvítasunnu
+holiday.is-IS24.name=Uppstigningardagur
-holiday.is-IS24.date=20160516
+holiday.is-IS24.date=20220526
-holiday.is-IS25.name=Lýðveldisdagurinn
+holiday.is-IS25.name=Hvítasunnudagur
-holiday.is-IS25.date=20160617
+holiday.is-IS25.date=20220605
-holiday.is-IS26.name=Frídagur verslunarmanna
+holiday.is-IS26.name=Annar dagur hvítasunnu
-holiday.is-IS26.date=20160801
+holiday.is-IS26.date=20220606
-holiday.is-IS27.name=Jól
+holiday.is-IS27.name=Þjóðhátíðardagurinn
-holiday.is-IS27.date=20161224
+holiday.is-IS27.date=20220617
-holiday.is-IS28.name=Jól
+holiday.is-IS28.name=Frídagur verslunarmanna
-holiday.is-IS28.date=20161225
+holiday.is-IS28.date=20220801
-holiday.is-IS29.name=Jól
+holiday.is-IS29.name=Aðfangadagur jóla
-holiday.is-IS29.date=20161226
+holiday.is-IS29.date=20221224
-holiday.is-IS30.name=Gamlárskvöld
+holiday.is-IS30.name=Jóladagur
-holiday.is-IS30.date=20161231
+holiday.is-IS30.date=20221225
 holiday.is-IS31.name=Annar dagur jóla
 holiday.is-IS31.date=20221226
 holiday.is-IS32.name=Gamlársdagur
 holiday.is-IS32.date=20221231
--- 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
-# http://holidata.net/it-IT/2015.json
+# https://holidata.net/it-IT/2021.json
-# http://holidata.net/it-IT/2016.json
+# https://holidata.net/it-IT/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.it-IT1.name=Capodanno
-holiday.it-IT1.date=20150101
+holiday.it-IT1.date=20210101
 holiday.it-IT2.name=Epifania
-holiday.it-IT2.date=20150106
+holiday.it-IT2.date=20210106
-holiday.it-IT3.name=Carnevale
+holiday.it-IT3.name=Pasqua
-holiday.it-IT3.date=20150217
+holiday.it-IT3.date=20210404
-holiday.it-IT4.name=Pasqua
+holiday.it-IT4.name=Pasquetta
-holiday.it-IT4.date=20150405
+holiday.it-IT4.date=20210405
 holiday.it-IT5.name=Festa della liberazione
-holiday.it-IT5.date=20150425
+holiday.it-IT5.date=20210425
 holiday.it-IT6.name=Festa del lavoro
-holiday.it-IT6.date=20150501
+holiday.it-IT6.date=20210501
 holiday.it-IT7.name=Festa della repubblica
-holiday.it-IT7.date=20150602
+holiday.it-IT7.date=20210602
 holiday.it-IT8.name=Assunzione (ferragosto)
-holiday.it-IT8.date=20150815
+holiday.it-IT8.date=20210815
 holiday.it-IT9.name=Ognissanti
-holiday.it-IT9.date=20151101
+holiday.it-IT9.date=20211101
 holiday.it-IT10.name=Immacolata concezione
-holiday.it-IT10.date=20151208
+holiday.it-IT10.date=20211208
 holiday.it-IT11.name=Natale
-holiday.it-IT11.date=20151225
+holiday.it-IT11.date=20211225
 holiday.it-IT12.name=S.to Stefano
-holiday.it-IT12.date=20151226
+holiday.it-IT12.date=20211226
 holiday.it-IT13.name=Capodanno
-holiday.it-IT13.date=20160101
+holiday.it-IT13.date=20220101
 holiday.it-IT14.name=Epifania
-holiday.it-IT14.date=20160106
+holiday.it-IT14.date=20220106
-holiday.it-IT15.name=Carnevale
+holiday.it-IT15.name=Pasqua
-holiday.it-IT15.date=20160209
+holiday.it-IT15.date=20220417
-holiday.it-IT16.name=Pasqua
+holiday.it-IT16.name=Pasquetta
-holiday.it-IT16.date=20160327
+holiday.it-IT16.date=20220418
 holiday.it-IT17.name=Festa della liberazione
-holiday.it-IT17.date=20160425
+holiday.it-IT17.date=20220425
 holiday.it-IT18.name=Festa del lavoro
-holiday.it-IT18.date=20160501
+holiday.it-IT18.date=20220501
 holiday.it-IT19.name=Festa della repubblica
-holiday.it-IT19.date=20160602
+holiday.it-IT19.date=20220602
 holiday.it-IT20.name=Assunzione (ferragosto)
-holiday.it-IT20.date=20160815
+holiday.it-IT20.date=20220815
 holiday.it-IT21.name=Ognissanti
-holiday.it-IT21.date=20161101
+holiday.it-IT21.date=20221101
 holiday.it-IT22.name=Immacolata concezione
-holiday.it-IT22.date=20161208
+holiday.it-IT22.date=20221208
 holiday.it-IT23.name=Natale
-holiday.it-IT23.date=20161225
+holiday.it-IT23.date=20221225
 holiday.it-IT24.name=S.to Stefano
-holiday.it-IT24.date=20161226
+holiday.it-IT24.date=20221226
--- a/doc/rc/holidays.jp-JP.rc
+++ b/doc/rc/holidays.jp-JP.rc
@@ -1,91 +0,0 @@
 ###############################################################################
 # 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
@@ -1,81 +0,0 @@
 ###############################################################################
 # 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
@@ -1,77 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/nb-NO/2015.json
+# https://holidata.net/nb-NO/2021.json
-# http://holidata.net/nb-NO/2016.json
+# https://holidata.net/nb-NO/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.nb-NO1.name=Nyttårsdag
-holiday.nb-NO1.date=20150101
+holiday.nb-NO1.date=20210101
 holiday.nb-NO2.name=Fastelavn
-holiday.nb-NO2.date=20150215
+holiday.nb-NO2.date=20210214
 holiday.nb-NO3.name=Palmesøndag
-holiday.nb-NO3.date=20150329
+holiday.nb-NO3.date=20210328
 holiday.nb-NO4.name=Skjærtorsdag
-holiday.nb-NO4.date=20150402
+holiday.nb-NO4.date=20210401
 holiday.nb-NO5.name=Langfredag
-holiday.nb-NO5.date=20150403
+holiday.nb-NO5.date=20210402
 holiday.nb-NO6.name=Påskedag
-holiday.nb-NO6.date=20150405
+holiday.nb-NO6.date=20210404
 holiday.nb-NO7.name=Påskedag
-holiday.nb-NO7.date=20150406
+holiday.nb-NO7.date=20210405
 holiday.nb-NO8.name=Offentlig Høytidsdag
-holiday.nb-NO8.date=20150501
+holiday.nb-NO8.date=20210501
 holiday.nb-NO9.name=Frigjøringsdag 1945
-holiday.nb-NO9.date=20150508
+holiday.nb-NO9.date=20210508
-holiday.nb-NO10.name=Grunnlovsdag
+holiday.nb-NO10.name=Kristi Himmelfartsdag
-holiday.nb-NO10.date=20150517
+holiday.nb-NO10.date=20210513
-holiday.nb-NO11.name=Kristi Himmelfartsdag
+holiday.nb-NO11.name=Grunnlovsdag
-holiday.nb-NO11.date=20150514
+holiday.nb-NO11.date=20210517
 holiday.nb-NO12.name=Pinsedag
-holiday.nb-NO12.date=20150524
+holiday.nb-NO12.date=20210523
 holiday.nb-NO13.name=Pinsedag
-holiday.nb-NO13.date=20150525
+holiday.nb-NO13.date=20210524
 holiday.nb-NO14.name=Julaften
-holiday.nb-NO14.date=20151224
+holiday.nb-NO14.date=20211224
 holiday.nb-NO15.name=Juledag
-holiday.nb-NO15.date=20151225
+holiday.nb-NO15.date=20211225
 holiday.nb-NO16.name=Juledag
-holiday.nb-NO16.date=20151226
+holiday.nb-NO16.date=20211226
 holiday.nb-NO17.name=Nyttårsaften
-holiday.nb-NO17.date=20151231
+holiday.nb-NO17.date=20211231
 holiday.nb-NO18.name=Nyttårsdag
-holiday.nb-NO18.date=20160101
+holiday.nb-NO18.date=20220101
 holiday.nb-NO19.name=Fastelavn
-holiday.nb-NO19.date=20160207
+holiday.nb-NO19.date=20220227
 holiday.nb-NO20.name=Palmesøndag
-holiday.nb-NO20.date=20160320
+holiday.nb-NO20.date=20220410
 holiday.nb-NO21.name=Skjærtorsdag
-holiday.nb-NO21.date=20160324
+holiday.nb-NO21.date=20220414
 holiday.nb-NO22.name=Langfredag
-holiday.nb-NO22.date=20160325
+holiday.nb-NO22.date=20220415
 holiday.nb-NO23.name=Påskedag
-holiday.nb-NO23.date=20160327
+holiday.nb-NO23.date=20220417
 holiday.nb-NO24.name=Påskedag
-holiday.nb-NO24.date=20160328
+holiday.nb-NO24.date=20220418
 holiday.nb-NO25.name=Offentlig Høytidsdag
-holiday.nb-NO25.date=20160501
+holiday.nb-NO25.date=20220501
 holiday.nb-NO26.name=Frigjøringsdag 1945
-holiday.nb-NO26.date=20160508
+holiday.nb-NO26.date=20220508
 holiday.nb-NO27.name=Grunnlovsdag
-holiday.nb-NO27.date=20160517
+holiday.nb-NO27.date=20220517
 holiday.nb-NO28.name=Kristi Himmelfartsdag
-holiday.nb-NO28.date=20160505
+holiday.nb-NO28.date=20220526
 holiday.nb-NO29.name=Pinsedag
-holiday.nb-NO29.date=20160515
+holiday.nb-NO29.date=20220605
 holiday.nb-NO30.name=Pinsedag
-holiday.nb-NO30.date=20160516
+holiday.nb-NO30.date=20220606
 holiday.nb-NO31.name=Julaften
-holiday.nb-NO31.date=20161224
+holiday.nb-NO31.date=20221224
 holiday.nb-NO32.name=Juledag
-holiday.nb-NO32.date=20161225
+holiday.nb-NO32.date=20221225
 holiday.nb-NO33.name=Juledag
-holiday.nb-NO33.date=20161226
+holiday.nb-NO33.date=20221226
 holiday.nb-NO34.name=Nyttårsaften
-holiday.nb-NO34.date=20161231
+holiday.nb-NO34.date=20221231
--- a/doc/rc/holidays.nb-SJ.rc
+++ b/doc/rc/holidays.nb-SJ.rc
@@ -1,97 +0,0 @@
 ###############################################################################
 # 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
-# http://holidata.net/nl-BE/2015.json
+# https://holidata.net/nl-BE/2021.json
-# http://holidata.net/nl-BE/2016.json
+# https://holidata.net/nl-BE/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.nl-BE1.name=Nieuwjaar
-holiday.nl-BE1.date=20150101
+holiday.nl-BE1.date=20210101
 holiday.nl-BE2.name=Pasen
-holiday.nl-BE2.date=20150405
+holiday.nl-BE2.date=20210404
 holiday.nl-BE3.name=Paasmaandag
-holiday.nl-BE3.date=20150406
+holiday.nl-BE3.date=20210405
 holiday.nl-BE4.name=Dag van de arbeid
-holiday.nl-BE4.date=20150501
+holiday.nl-BE4.date=20210501
 holiday.nl-BE5.name=Onze Lieve Heer hemelvaart
-holiday.nl-BE5.date=20150514
+holiday.nl-BE5.date=20210513
 holiday.nl-BE6.name=Pinksteren
-holiday.nl-BE6.date=20150524
+holiday.nl-BE6.date=20210523
 holiday.nl-BE7.name=Pinkstermaandag
-holiday.nl-BE7.date=20150525
+holiday.nl-BE7.date=20210524
 holiday.nl-BE8.name=Nationale feestdag
-holiday.nl-BE8.date=20150721
+holiday.nl-BE8.date=20210721
 holiday.nl-BE9.name=Onze Lieve Vrouw hemelvaart
-holiday.nl-BE9.date=20150815
+holiday.nl-BE9.date=20210815
 holiday.nl-BE10.name=Allerheiligen
-holiday.nl-BE10.date=20151101
+holiday.nl-BE10.date=20211101
 holiday.nl-BE11.name=Wapenstilstand
-holiday.nl-BE11.date=20151111
+holiday.nl-BE11.date=20211111
 holiday.nl-BE12.name=Kerstmis
-holiday.nl-BE12.date=20151225
+holiday.nl-BE12.date=20211225
 holiday.nl-BE13.name=Nieuwjaar
-holiday.nl-BE13.date=20160101
+holiday.nl-BE13.date=20220101
 holiday.nl-BE14.name=Pasen
-holiday.nl-BE14.date=20160327
+holiday.nl-BE14.date=20220417
 holiday.nl-BE15.name=Paasmaandag
-holiday.nl-BE15.date=20160328
+holiday.nl-BE15.date=20220418
 holiday.nl-BE16.name=Dag van de arbeid
-holiday.nl-BE16.date=20160501
+holiday.nl-BE16.date=20220501
 holiday.nl-BE17.name=Onze Lieve Heer hemelvaart
-holiday.nl-BE17.date=20160505
+holiday.nl-BE17.date=20220526
 holiday.nl-BE18.name=Pinksteren
-holiday.nl-BE18.date=20160515
+holiday.nl-BE18.date=20220605
 holiday.nl-BE19.name=Pinkstermaandag
-holiday.nl-BE19.date=20160516
+holiday.nl-BE19.date=20220606
 holiday.nl-BE20.name=Nationale feestdag
-holiday.nl-BE20.date=20160721
+holiday.nl-BE20.date=20220721
 holiday.nl-BE21.name=Onze Lieve Vrouw hemelvaart
-holiday.nl-BE21.date=20160815
+holiday.nl-BE21.date=20220815
 holiday.nl-BE22.name=Allerheiligen
-holiday.nl-BE22.date=20161101
+holiday.nl-BE22.date=20221101
 holiday.nl-BE23.name=Wapenstilstand
-holiday.nl-BE23.date=20161111
+holiday.nl-BE23.date=20221111
 holiday.nl-BE24.name=Kerstmis
-holiday.nl-BE24.date=20161225
+holiday.nl-BE24.date=20221225
--- 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
-# http://holidata.net/nl-NL/2015.json
+# https://holidata.net/nl-NL/2021.json
-# http://holidata.net/nl-NL/2016.json
+# https://holidata.net/nl-NL/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
-holiday.nl-NL1.name=Nieuwjaar
+holiday.nl-NL1.name=Nieuwjaarsdag
-holiday.nl-NL1.date=20150101
+holiday.nl-NL1.date=20210101
 holiday.nl-NL2.name=Goede Vrijdag
-holiday.nl-NL2.date=20150403
+holiday.nl-NL2.date=20210402
-holiday.nl-NL3.name=Pasen
+holiday.nl-NL3.name=Eerste Paasdag
-holiday.nl-NL3.date=20150405
+holiday.nl-NL3.date=20210404
-holiday.nl-NL4.name=Tweede Pasdag
+holiday.nl-NL4.name=Tweede Paasdag
-holiday.nl-NL4.date=20150406
+holiday.nl-NL4.date=20210405
-holiday.nl-NL5.name=Koninginnedag
+holiday.nl-NL5.name=Koningsdag
-holiday.nl-NL5.date=20150427
+holiday.nl-NL5.date=20210427
 holiday.nl-NL6.name=Dodenherdenking
-holiday.nl-NL6.date=20150504
+holiday.nl-NL6.date=20210504
 holiday.nl-NL7.name=Bevrijdingsdag
-holiday.nl-NL7.date=20150505
+holiday.nl-NL7.date=20210505
 holiday.nl-NL8.name=Hemelvaartsdag
-holiday.nl-NL8.date=20150514
+holiday.nl-NL8.date=20210513
-holiday.nl-NL9.name=Pinksteren
+holiday.nl-NL9.name=Eerste Pinksterdag
-holiday.nl-NL9.date=20150524
+holiday.nl-NL9.date=20210523
 holiday.nl-NL10.name=Tweede Pinksterdag
-holiday.nl-NL10.date=20150525
+holiday.nl-NL10.date=20210524
 holiday.nl-NL11.name=Sinterklaas
-holiday.nl-NL11.date=20151205
+holiday.nl-NL11.date=20211205
-holiday.nl-NL12.name=Kerstmis
+holiday.nl-NL12.name=Koninkrijksdag
-holiday.nl-NL12.date=20151225
+holiday.nl-NL12.date=20211215
-holiday.nl-NL13.name=Tweede Kerstdag
+holiday.nl-NL13.name=Eerste Kerstdag
-holiday.nl-NL13.date=20151226
+holiday.nl-NL13.date=20211225
-holiday.nl-NL14.name=Nieuwjaar
+holiday.nl-NL14.name=Tweede Kerstdag
-holiday.nl-NL14.date=20160101
+holiday.nl-NL14.date=20211226
-holiday.nl-NL15.name=Goede Vrijdag
+holiday.nl-NL15.name=Nieuwjaarsdag
-holiday.nl-NL15.date=20160325
+holiday.nl-NL15.date=20220101
-holiday.nl-NL16.name=Pasen
+holiday.nl-NL16.name=Goede Vrijdag
-holiday.nl-NL16.date=20160327
+holiday.nl-NL16.date=20220415
-holiday.nl-NL17.name=Tweede Pasdag
+holiday.nl-NL17.name=Eerste Paasdag
-holiday.nl-NL17.date=20160328
+holiday.nl-NL17.date=20220417
-holiday.nl-NL18.name=Koninginnedag
+holiday.nl-NL18.name=Tweede Paasdag
-holiday.nl-NL18.date=20160427
+holiday.nl-NL18.date=20220418
-holiday.nl-NL19.name=Dodenherdenking
+holiday.nl-NL19.name=Koningsdag
-holiday.nl-NL19.date=20160504
+holiday.nl-NL19.date=20220427
-holiday.nl-NL20.name=Bevrijdingsdag
+holiday.nl-NL20.name=Dodenherdenking
-holiday.nl-NL20.date=20160505
+holiday.nl-NL20.date=20220504
-holiday.nl-NL21.name=Hemelvaartsdag
+holiday.nl-NL21.name=Bevrijdingsdag
-holiday.nl-NL21.date=20160505
+holiday.nl-NL21.date=20220505
-holiday.nl-NL22.name=Pinksteren
+holiday.nl-NL22.name=Hemelvaartsdag
-holiday.nl-NL22.date=20160515
+holiday.nl-NL22.date=20220526
-holiday.nl-NL23.name=Tweede Pinksterdag
+holiday.nl-NL23.name=Eerste Pinksterdag
-holiday.nl-NL23.date=20160516
+holiday.nl-NL23.date=20220605
-holiday.nl-NL24.name=Sinterklaas
+holiday.nl-NL24.name=Tweede Pinksterdag
-holiday.nl-NL24.date=20161205
+holiday.nl-NL24.date=20220606
-holiday.nl-NL25.name=Kerstmis
+holiday.nl-NL25.name=Sinterklaas
-holiday.nl-NL25.date=20161225
+holiday.nl-NL25.date=20221205
-holiday.nl-NL26.name=Tweede Kerstdag
+holiday.nl-NL26.name=Koninkrijksdag
-holiday.nl-NL26.date=20161226
+holiday.nl-NL26.date=20221215
 holiday.nl-NL27.name=Eerste Kerstdag
 holiday.nl-NL27.date=20221225
 holiday.nl-NL28.name=Tweede Kerstdag
 holiday.nl-NL28.date=20221226
--- 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
-# http://holidata.net/pl-PL/2015.json
+# https://holidata.net/pl-PL/2021.json
-# http://holidata.net/pl-PL/2016.json
+# https://holidata.net/pl-PL/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.pl-PL1.name=Nowy Rok
-holiday.pl-PL1.date=20150101
+holiday.pl-PL1.date=20210101
 holiday.pl-PL2.name=Trzech Króli
-holiday.pl-PL2.date=20150106
+holiday.pl-PL2.date=20210106
 holiday.pl-PL3.name=Wielkanoc
-holiday.pl-PL3.date=20150405
+holiday.pl-PL3.date=20210404
 holiday.pl-PL4.name=Poniedziałek Wielkanocny
-holiday.pl-PL4.date=20150406
+holiday.pl-PL4.date=20210405
 holiday.pl-PL5.name=Święto Pracy
-holiday.pl-PL5.date=20150501
+holiday.pl-PL5.date=20210501
 holiday.pl-PL6.name=Święto Konstytucji Trzeciego Maja
-holiday.pl-PL6.date=20150503
+holiday.pl-PL6.date=20210503
 holiday.pl-PL7.name=Zielone Świątki
-holiday.pl-PL7.date=20150524
+holiday.pl-PL7.date=20210523
 holiday.pl-PL8.name=Boże Ciało
-holiday.pl-PL8.date=20150604
+holiday.pl-PL8.date=20210603
-holiday.pl-PL9.name=Święto Wojska Polskiego
+holiday.pl-PL9.name=Wniebowzięcie Najświętszej Maryi Panny
-holiday.pl-PL9.date=20150815
+holiday.pl-PL9.date=20210815
-holiday.pl-PL10.name=Wniebowzięcia NMP
+holiday.pl-PL10.name=Wszystkich Świętych
-holiday.pl-PL10.date=20150815
+holiday.pl-PL10.date=20211101
-holiday.pl-PL11.name=Wszystkich Świętych
+holiday.pl-PL11.name=Narodowe Święto Niepodległości
-holiday.pl-PL11.date=20151101
+holiday.pl-PL11.date=20211111
-holiday.pl-PL12.name=Dzień Niepodległości
+holiday.pl-PL12.name=Boże Narodzenie (pierwszy dzień)
-holiday.pl-PL12.date=20151111
+holiday.pl-PL12.date=20211225
-holiday.pl-PL13.name=Boże Narodzenie (pierwszy dzień)
+holiday.pl-PL13.name=Boże Narodzenie (drugi dzień)
-holiday.pl-PL13.date=20151225
+holiday.pl-PL13.date=20211226
-holiday.pl-PL14.name=Boże Narodzenie (drugi dzień)
+holiday.pl-PL14.name=Nowy Rok
-holiday.pl-PL14.date=20151226
+holiday.pl-PL14.date=20220101
-holiday.pl-PL15.name=Nowy Rok
+holiday.pl-PL15.name=Trzech Króli
-holiday.pl-PL15.date=20160101
+holiday.pl-PL15.date=20220106
-holiday.pl-PL16.name=Trzech Króli
+holiday.pl-PL16.name=Wielkanoc
-holiday.pl-PL16.date=20160106
+holiday.pl-PL16.date=20220417
-holiday.pl-PL17.name=Wielkanoc
+holiday.pl-PL17.name=Poniedziałek Wielkanocny
-holiday.pl-PL17.date=20160327
+holiday.pl-PL17.date=20220418
-holiday.pl-PL18.name=Poniedziałek Wielkanocny
+holiday.pl-PL18.name=Święto Pracy
-holiday.pl-PL18.date=20160328
+holiday.pl-PL18.date=20220501
-holiday.pl-PL19.name=Święto Pracy
+holiday.pl-PL19.name=Święto Konstytucji Trzeciego Maja
-holiday.pl-PL19.date=20160501
+holiday.pl-PL19.date=20220503
-holiday.pl-PL20.name=Święto Konstytucji Trzeciego Maja
+holiday.pl-PL20.name=Zielone Świątki
-holiday.pl-PL20.date=20160503
+holiday.pl-PL20.date=20220605
-holiday.pl-PL21.name=Zielone Świątki
+holiday.pl-PL21.name=Boże Ciało
-holiday.pl-PL21.date=20160515
+holiday.pl-PL21.date=20220616
-holiday.pl-PL22.name=Boże Ciało
+holiday.pl-PL22.name=Wniebowzięcie Najświętszej Maryi Panny
-holiday.pl-PL22.date=20160526
+holiday.pl-PL22.date=20220815
-holiday.pl-PL23.name=Święto Wojska Polskiego
+holiday.pl-PL23.name=Wszystkich Świętych
-holiday.pl-PL23.date=20160815
+holiday.pl-PL23.date=20221101
-holiday.pl-PL24.name=Wniebowzięcia NMP
+holiday.pl-PL24.name=Narodowe Święto Niepodległości
-holiday.pl-PL24.date=20160815
+holiday.pl-PL24.date=20221111
-holiday.pl-PL25.name=Wszystkich Świętych
+holiday.pl-PL25.name=Boże Narodzenie (pierwszy dzień)
-holiday.pl-PL25.date=20161101
+holiday.pl-PL25.date=20221225
-holiday.pl-PL26.name=Dzień Niepodległości
+holiday.pl-PL26.name=Boże Narodzenie (drugi dzień)
-holiday.pl-PL26.date=20161111
+holiday.pl-PL26.date=20221226
 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
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/pt-BR/2015.json
+# https://holidata.net/pt-BR/2021.json
-# http://holidata.net/pt-BR/2016.json
+# https://holidata.net/pt-BR/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,219 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.pt-BR1.name=Confraternização Universal
-holiday.pt-BR1.date=20150101
+holiday.pt-BR1.date=20210101
-holiday.pt-BR2.name=Carnaval
+holiday.pt-BR2.name=Criação do Estado de Rondônia
-holiday.pt-BR2.date=20150216
+holiday.pt-BR2.date=20210104
-holiday.pt-BR3.name=Carnaval
+holiday.pt-BR3.name=Dia do Evangélico no Acre
-holiday.pt-BR3.date=20150217
+holiday.pt-BR3.date=20210123
-holiday.pt-BR4.name=Sexta-feira Santa
+holiday.pt-BR4.name=Carnaval
-holiday.pt-BR4.date=20150403
+holiday.pt-BR4.date=20210216
-holiday.pt-BR5.name=Páscoa
+holiday.pt-BR5.name=Revolução Pernambucana de 1817
-holiday.pt-BR5.date=20150405
+holiday.pt-BR5.date=20210306
-holiday.pt-BR6.name=Tiradentes
+holiday.pt-BR6.name=Dia Internacional da Mulher
-holiday.pt-BR6.date=20150421
+holiday.pt-BR6.date=20210308
-holiday.pt-BR7.name=Dia do Trabalho
+holiday.pt-BR7.name=Autonomia do Estado de Tocantins
-holiday.pt-BR7.date=20150501
+holiday.pt-BR7.date=20210318
-holiday.pt-BR8.name=Corpus Christi
+holiday.pt-BR8.name=Dia de São José
-holiday.pt-BR8.date=20150604
+holiday.pt-BR8.date=20210319
-holiday.pt-BR9.name=Independência do Brasil
+holiday.pt-BR9.name=Abolição da Escravidão no Ceará
-holiday.pt-BR9.date=20150907
+holiday.pt-BR9.date=20210325
-holiday.pt-BR10.name=Nossa Senhora Aparecida
+holiday.pt-BR10.name=Páscoa
-holiday.pt-BR10.date=20151012
+holiday.pt-BR10.date=20210404
-holiday.pt-BR11.name=Finados
+holiday.pt-BR11.name=Fundação de Brasília
-holiday.pt-BR11.date=20151102
+holiday.pt-BR11.date=20210421
-holiday.pt-BR12.name=Proclamação da República
+holiday.pt-BR12.name=Execução de Tiradentes
-holiday.pt-BR12.date=20151115
+holiday.pt-BR12.date=20210421
-holiday.pt-BR13.name=Natal
+holiday.pt-BR13.name=Tiradentes
-holiday.pt-BR13.date=20151225
+holiday.pt-BR13.date=20210421
-holiday.pt-BR14.name=Confraternização Universal
+holiday.pt-BR14.name=Dia de São Jorge
-holiday.pt-BR14.date=20160101
+holiday.pt-BR14.date=20210423
-holiday.pt-BR15.name=Carnaval
+holiday.pt-BR15.name=Dia Internacional do Trabalhador
-holiday.pt-BR15.date=20160208
+holiday.pt-BR15.date=20210501
-holiday.pt-BR16.name=Carnaval
+holiday.pt-BR16.name=Aniversário do Estado do Acre
-holiday.pt-BR16.date=20160209
+holiday.pt-BR16.date=20210615
-holiday.pt-BR17.name=Sexta-feira Santa
+holiday.pt-BR17.name=Dia do Evangélico em Rondônia
-holiday.pt-BR17.date=20160325
+holiday.pt-BR17.date=20210618
-holiday.pt-BR18.name=Páscoa
+holiday.pt-BR18.name=São João
-holiday.pt-BR18.date=20160327
+holiday.pt-BR18.date=20210624
-holiday.pt-BR19.name=Tiradentes
+holiday.pt-BR19.name=São Pedro
-holiday.pt-BR19.date=20160421
+holiday.pt-BR19.date=20210629
-holiday.pt-BR20.name=Dia do Trabalho
+holiday.pt-BR20.name=Independência da Bahia
-holiday.pt-BR20.date=20160501
+holiday.pt-BR20.date=20210702
-holiday.pt-BR21.name=Corpus Christi
+holiday.pt-BR21.name=Emancipação Política de Sergipe
-holiday.pt-BR21.date=20160526
+holiday.pt-BR21.date=20210708
-holiday.pt-BR22.name=Independência do Brasil
+holiday.pt-BR22.name=Revolução Constitucionalista de 1932
-holiday.pt-BR22.date=20160907
+holiday.pt-BR22.date=20210709
-holiday.pt-BR23.name=Nossa Senhora Aparecida
+holiday.pt-BR23.name=Fundação da Cidade de Goiás
-holiday.pt-BR23.date=20161012
+holiday.pt-BR23.date=20210726
-holiday.pt-BR24.name=Finados
+holiday.pt-BR24.name=Adesão do Maranhão à Independência do Brasil
-holiday.pt-BR24.date=20161102
+holiday.pt-BR24.date=20210728
-holiday.pt-BR25.name=Proclamação da República
+holiday.pt-BR25.name=Fundação do Estado da Paraíba
-holiday.pt-BR25.date=20161115
+holiday.pt-BR25.date=20210805
-holiday.pt-BR26.name=Natal
+holiday.pt-BR26.name=Dia do Rio Grande do Norte
-holiday.pt-BR26.date=20161225
+holiday.pt-BR26.date=20210807
 holiday.pt-BR27.name=Dia de Santa Catarina
 holiday.pt-BR27.date=20210811
 holiday.pt-BR28.name=Dia de Nossa Senhora da Assunção
 holiday.pt-BR28.date=20210815
 holiday.pt-BR29.name=Adesão do Pará à Independência do Brasil
 holiday.pt-BR29.date=20210815
 holiday.pt-BR30.name=Dia da Amazônia
 holiday.pt-BR30.date=20210905
 holiday.pt-BR31.name=Elevação do Amazonas à Categoria de Província
 holiday.pt-BR31.date=20210905
 holiday.pt-BR32.name=Independência do Brasil
 holiday.pt-BR32.date=20210907
 holiday.pt-BR33.name=Nossa Senhora da Natividade
 holiday.pt-BR33.date=20210908
 holiday.pt-BR34.name=Criação do Território Federal do Amapá
 holiday.pt-BR34.date=20210913
 holiday.pt-BR35.name=Emancipação Política do Alagoas
 holiday.pt-BR35.date=20210916
 holiday.pt-BR36.name=Dia do Gaúcho
 holiday.pt-BR36.date=20210920
 holiday.pt-BR37.name=Mártires de Cunhaú e Uruaçu
 holiday.pt-BR37.date=20211003
 holiday.pt-BR38.name=Criação dos Estado de Roraima
 holiday.pt-BR38.date=20211005
 holiday.pt-BR39.name=Criação dos Estado de Tocantins
 holiday.pt-BR39.date=20211005
 holiday.pt-BR40.name=Criação do Estado do Mato Grosso do Sul
 holiday.pt-BR40.date=20211011
 holiday.pt-BR41.name=Nossa Senhora Aparecida
 holiday.pt-BR41.date=20211012
 holiday.pt-BR42.name=Dia do Piauí
 holiday.pt-BR42.date=20211019
 holiday.pt-BR43.name=Pedra Fundamental de Goiânia
 holiday.pt-BR43.date=20211024
 holiday.pt-BR44.name=Finados
 holiday.pt-BR44.date=20211102
 holiday.pt-BR45.name=Proclamação da República
 holiday.pt-BR45.date=20211115
 holiday.pt-BR46.name=Assinatura do Tratado de Petrópolis
 holiday.pt-BR46.date=20211117
 holiday.pt-BR47.name=Morte de Zumbi dos Palmares
 holiday.pt-BR47.date=20211120
 holiday.pt-BR48.name=Dia da Consciência Negra
 holiday.pt-BR48.date=20211120
 holiday.pt-BR49.name=Dia de Santa Catarina de Alexandria
 holiday.pt-BR49.date=20211125
 holiday.pt-BR50.name=Dia do Evangélico do Distrito Federal
 holiday.pt-BR50.date=20211130
 holiday.pt-BR51.name=Nossa Senhora da Conceição
 holiday.pt-BR51.date=20211208
 holiday.pt-BR52.name=Emancipação Política do Estado do Paraná
 holiday.pt-BR52.date=20211219
 holiday.pt-BR53.name=Natal
 holiday.pt-BR53.date=20211225
 holiday.pt-BR54.name=Confraternização Universal
 holiday.pt-BR54.date=20220101
 holiday.pt-BR55.name=Criação do Estado de Rondônia
 holiday.pt-BR55.date=20220104
 holiday.pt-BR56.name=Dia do Evangélico no Acre
 holiday.pt-BR56.date=20220123
 holiday.pt-BR57.name=Carnaval
 holiday.pt-BR57.date=20220301
 holiday.pt-BR58.name=Revolução Pernambucana de 1817
 holiday.pt-BR58.date=20220306
 holiday.pt-BR59.name=Dia Internacional da Mulher
 holiday.pt-BR59.date=20220308
 holiday.pt-BR60.name=Autonomia do Estado de Tocantins
 holiday.pt-BR60.date=20220318
 holiday.pt-BR61.name=Dia de São José
 holiday.pt-BR61.date=20220319
 holiday.pt-BR62.name=Abolição da Escravidão no Ceará
 holiday.pt-BR62.date=20220325
 holiday.pt-BR63.name=Páscoa
 holiday.pt-BR63.date=20220417
 holiday.pt-BR64.name=Fundação de Brasília
 holiday.pt-BR64.date=20220421
 holiday.pt-BR65.name=Execução de Tiradentes
 holiday.pt-BR65.date=20220421
 holiday.pt-BR66.name=Tiradentes
 holiday.pt-BR66.date=20220421
 holiday.pt-BR67.name=Dia de São Jorge
 holiday.pt-BR67.date=20220423
 holiday.pt-BR68.name=Dia Internacional do Trabalhador
 holiday.pt-BR68.date=20220501
 holiday.pt-BR69.name=Aniversário do Estado do Acre
 holiday.pt-BR69.date=20220615
 holiday.pt-BR70.name=Dia do Evangélico em Rondônia
 holiday.pt-BR70.date=20220618
 holiday.pt-BR71.name=São João
 holiday.pt-BR71.date=20220624
 holiday.pt-BR72.name=São Pedro
 holiday.pt-BR72.date=20220629
 holiday.pt-BR73.name=Independência da Bahia
 holiday.pt-BR73.date=20220702
 holiday.pt-BR74.name=Emancipação Política de Sergipe
 holiday.pt-BR74.date=20220708
 holiday.pt-BR75.name=Revolução Constitucionalista de 1932
 holiday.pt-BR75.date=20220709
 holiday.pt-BR76.name=Fundação da Cidade de Goiás
 holiday.pt-BR76.date=20220726
 holiday.pt-BR77.name=Adesão do Maranhão à Independência do Brasil
 holiday.pt-BR77.date=20220728
 holiday.pt-BR78.name=Fundação do Estado da Paraíba
 holiday.pt-BR78.date=20220805
 holiday.pt-BR79.name=Dia do Rio Grande do Norte
 holiday.pt-BR79.date=20220807
 holiday.pt-BR80.name=Dia de Santa Catarina
 holiday.pt-BR80.date=20220811
 holiday.pt-BR81.name=Dia de Nossa Senhora da Assunção
 holiday.pt-BR81.date=20220815
 holiday.pt-BR82.name=Adesão do Pará à Independência do Brasil
 holiday.pt-BR82.date=20220815
 holiday.pt-BR83.name=Dia da Amazônia
 holiday.pt-BR83.date=20220905
 holiday.pt-BR84.name=Elevação do Amazonas à Categoria de Província
 holiday.pt-BR84.date=20220905
 holiday.pt-BR85.name=Independência do Brasil
 holiday.pt-BR85.date=20220907
 holiday.pt-BR86.name=Nossa Senhora da Natividade
 holiday.pt-BR86.date=20220908
 holiday.pt-BR87.name=Criação do Território Federal do Amapá
 holiday.pt-BR87.date=20220913
 holiday.pt-BR88.name=Emancipação Política do Alagoas
 holiday.pt-BR88.date=20220916
 holiday.pt-BR89.name=Dia do Gaúcho
 holiday.pt-BR89.date=20220920
 holiday.pt-BR90.name=Mártires de Cunhaú e Uruaçu
 holiday.pt-BR90.date=20221003
 holiday.pt-BR91.name=Criação dos Estado de Roraima
 holiday.pt-BR91.date=20221005
 holiday.pt-BR92.name=Criação dos Estado de Tocantins
 holiday.pt-BR92.date=20221005
 holiday.pt-BR93.name=Criação do Estado do Mato Grosso do Sul
 holiday.pt-BR93.date=20221011
 holiday.pt-BR94.name=Nossa Senhora Aparecida
 holiday.pt-BR94.date=20221012
 holiday.pt-BR95.name=Dia do Piauí
 holiday.pt-BR95.date=20221019
 holiday.pt-BR96.name=Pedra Fundamental de Goiânia
 holiday.pt-BR96.date=20221024
 holiday.pt-BR97.name=Finados
 holiday.pt-BR97.date=20221102
 holiday.pt-BR98.name=Proclamação da República
 holiday.pt-BR98.date=20221115
 holiday.pt-BR99.name=Assinatura do Tratado de Petrópolis
 holiday.pt-BR99.date=20221117
 holiday.pt-BR100.name=Morte de Zumbi dos Palmares
 holiday.pt-BR100.date=20221120
 holiday.pt-BR101.name=Dia da Consciência Negra
 holiday.pt-BR101.date=20221120
 holiday.pt-BR102.name=Dia de Santa Catarina de Alexandria
 holiday.pt-BR102.date=20221125
 holiday.pt-BR103.name=Dia do Evangélico do Distrito Federal
 holiday.pt-BR103.date=20221130
 holiday.pt-BR104.name=Nossa Senhora da Conceição
 holiday.pt-BR104.date=20221208
 holiday.pt-BR105.name=Emancipação Política do Estado do Paraná
 holiday.pt-BR105.date=20221219
 holiday.pt-BR106.name=Natal
 holiday.pt-BR106.date=20221225
--- 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
-# http://holidata.net/pt-PT/2015.json
+# https://holidata.net/pt-PT/2021.json
-# http://holidata.net/pt-PT/2016.json
+# https://holidata.net/pt-PT/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.pt-PT1.name=Ano Novo
-holiday.pt-PT1.date=20150101
+holiday.pt-PT1.date=20210101
 holiday.pt-PT2.name=Carnaval
-holiday.pt-PT2.date=20150217
+holiday.pt-PT2.date=20210216
 holiday.pt-PT3.name=Sexta-feira Santa
-holiday.pt-PT3.date=20150403
+holiday.pt-PT3.date=20210402
 holiday.pt-PT4.name=Páscoa
-holiday.pt-PT4.date=20150405
+holiday.pt-PT4.date=20210404
 holiday.pt-PT5.name=Dia da Liberdade
-holiday.pt-PT5.date=20150425
+holiday.pt-PT5.date=20210425
 holiday.pt-PT6.name=Dia do Trabalhador
-holiday.pt-PT6.date=20150501
+holiday.pt-PT6.date=20210501
 holiday.pt-PT7.name=Corpo de Deus
-holiday.pt-PT7.date=20150604
+holiday.pt-PT7.date=20210603
 holiday.pt-PT8.name=Dia de Portugal
-holiday.pt-PT8.date=20150610
+holiday.pt-PT8.date=20210610
 holiday.pt-PT9.name=Assunção de Nossa Senhora
-holiday.pt-PT9.date=20150815
+holiday.pt-PT9.date=20210815
 holiday.pt-PT10.name=Implantação da República
-holiday.pt-PT10.date=20151005
+holiday.pt-PT10.date=20211005
-holiday.pt-PT11.name=Todos os Santos
+holiday.pt-PT11.name=Dia de Todos os Santos
-holiday.pt-PT11.date=20151101
+holiday.pt-PT11.date=20211101
 holiday.pt-PT12.name=Restauração da Independência
-holiday.pt-PT12.date=20151201
+holiday.pt-PT12.date=20211201
 holiday.pt-PT13.name=Imaculada Conceição
-holiday.pt-PT13.date=20151208
+holiday.pt-PT13.date=20211208
 holiday.pt-PT14.name=Natal
-holiday.pt-PT14.date=20151225
+holiday.pt-PT14.date=20211225
 holiday.pt-PT15.name=Ano Novo
-holiday.pt-PT15.date=20160101
+holiday.pt-PT15.date=20220101
 holiday.pt-PT16.name=Carnaval
-holiday.pt-PT16.date=20160209
+holiday.pt-PT16.date=20220301
 holiday.pt-PT17.name=Sexta-feira Santa
-holiday.pt-PT17.date=20160325
+holiday.pt-PT17.date=20220415
 holiday.pt-PT18.name=Páscoa
-holiday.pt-PT18.date=20160327
+holiday.pt-PT18.date=20220417
 holiday.pt-PT19.name=Dia da Liberdade
-holiday.pt-PT19.date=20160425
+holiday.pt-PT19.date=20220425
 holiday.pt-PT20.name=Dia do Trabalhador
-holiday.pt-PT20.date=20160501
+holiday.pt-PT20.date=20220501
-holiday.pt-PT21.name=Corpo de Deus
+holiday.pt-PT21.name=Dia de Portugal
-holiday.pt-PT21.date=20160526
+holiday.pt-PT21.date=20220610
-holiday.pt-PT22.name=Dia de Portugal
+holiday.pt-PT22.name=Corpo de Deus
-holiday.pt-PT22.date=20160610
+holiday.pt-PT22.date=20220616
 holiday.pt-PT23.name=Assunção de Nossa Senhora
-holiday.pt-PT23.date=20160815
+holiday.pt-PT23.date=20220815
 holiday.pt-PT24.name=Implantação da República
-holiday.pt-PT24.date=20161005
+holiday.pt-PT24.date=20221005
-holiday.pt-PT25.name=Todos os Santos
+holiday.pt-PT25.name=Dia de Todos os Santos
-holiday.pt-PT25.date=20161101
+holiday.pt-PT25.date=20221101
 holiday.pt-PT26.name=Restauração da Independência
-holiday.pt-PT26.date=20161201
+holiday.pt-PT26.date=20221201
 holiday.pt-PT27.name=Imaculada Conceição
-holiday.pt-PT27.date=20161208
+holiday.pt-PT27.date=20221208
 holiday.pt-PT28.name=Natal
-holiday.pt-PT28.date=20161225
+holiday.pt-PT28.date=20221225
--- 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
-# http://holidata.net/ru-RU/2015.json
+# https://holidata.net/ru-RU/2021.json
-# http://holidata.net/ru-RU/2016.json
+# https://holidata.net/ru-RU/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.ru-RU1.name=Новый Год
-holiday.ru-RU1.date=20150101
+holiday.ru-RU1.date=20210101
 holiday.ru-RU2.name=Рождество Христово
-holiday.ru-RU2.date=20150107
+holiday.ru-RU2.date=20210107
 holiday.ru-RU3.name=День защитника Отечества
-holiday.ru-RU3.date=20150223
+holiday.ru-RU3.date=20210223
 holiday.ru-RU4.name=Международный женский день
-holiday.ru-RU4.date=20150308
+holiday.ru-RU4.date=20210308
-holiday.ru-RU5.name=Пасха
+holiday.ru-RU5.name=Праздник весны и труда
-holiday.ru-RU5.date=20150412
+holiday.ru-RU5.date=20210501
-holiday.ru-RU6.name=Праздник весны и труда
+holiday.ru-RU6.name=Пасха
-holiday.ru-RU6.date=20150501
+holiday.ru-RU6.date=20210502
 holiday.ru-RU7.name=День Победы
-holiday.ru-RU7.date=20150509
+holiday.ru-RU7.date=20210509
 holiday.ru-RU8.name=День России
-holiday.ru-RU8.date=20150612
+holiday.ru-RU8.date=20210612
 holiday.ru-RU9.name=День народного единства
-holiday.ru-RU9.date=20151104
+holiday.ru-RU9.date=20211104
 holiday.ru-RU10.name=Новый Год
-holiday.ru-RU10.date=20160101
+holiday.ru-RU10.date=20220101
 holiday.ru-RU11.name=Рождество Христово
-holiday.ru-RU11.date=20160107
+holiday.ru-RU11.date=20220107
 holiday.ru-RU12.name=День защитника Отечества
-holiday.ru-RU12.date=20160223
+holiday.ru-RU12.date=20220223
 holiday.ru-RU13.name=Международный женский день
-holiday.ru-RU13.date=20160308
+holiday.ru-RU13.date=20220308
 holiday.ru-RU14.name=Пасха
-holiday.ru-RU14.date=20160501
+holiday.ru-RU14.date=20220424
 holiday.ru-RU15.name=Праздник весны и труда
-holiday.ru-RU15.date=20160501
+holiday.ru-RU15.date=20220501
 holiday.ru-RU16.name=День Победы
-holiday.ru-RU16.date=20160509
+holiday.ru-RU16.date=20220509
 holiday.ru-RU17.name=День России
-holiday.ru-RU17.date=20160612
+holiday.ru-RU17.date=20220612
 holiday.ru-RU18.name=День народного единства
-holiday.ru-RU18.date=20161104
+holiday.ru-RU18.date=20221104
--- a/doc/rc/holidays.sk-SK.rc
+++ b/doc/rc/holidays.sk-SK.rc
@@ -0,0 +1,89 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # https://holidata.net/sk-SK/2021.json
 # https://holidata.net/sk-SK/2022.json
 #
 # Copyright 2006 - 2021, Tomas Babej, 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.
 #
 # https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.sk-SK1.name=Deň vzniku Slovenskej republiky
 holiday.sk-SK1.date=20210101
 holiday.sk-SK2.name=Zjavenie Pána / Traja králi
 holiday.sk-SK2.date=20210106
 holiday.sk-SK3.name=Veľký piatok
 holiday.sk-SK3.date=20210402
 holiday.sk-SK4.name=Veľkonočný pondelok
 holiday.sk-SK4.date=20210405
 holiday.sk-SK5.name=Sviatok práce
 holiday.sk-SK5.date=20210501
 holiday.sk-SK6.name=Deň víťazstva nad fašizmom
 holiday.sk-SK6.date=20210508
 holiday.sk-SK7.name=Sviatok svätého Cyrila a Metoda
 holiday.sk-SK7.date=20210705
 holiday.sk-SK8.name=Výročie SNP
 holiday.sk-SK8.date=20210829
 holiday.sk-SK9.name=Deň Ústavy Slovenskej republiky
 holiday.sk-SK9.date=20210901
 holiday.sk-SK10.name=Sedembolestná Panna Mária
 holiday.sk-SK10.date=20210915
 holiday.sk-SK11.name=Sviatok všetkých svätých
 holiday.sk-SK11.date=20211101
 holiday.sk-SK12.name=Deň boja za slobodu a demokraciu
 holiday.sk-SK12.date=20211117
 holiday.sk-SK13.name=Štedrý deň
 holiday.sk-SK13.date=20211224
 holiday.sk-SK14.name=Prvý sviatok vianočný
 holiday.sk-SK14.date=20211225
 holiday.sk-SK15.name=Druhý sviatok vianočný
 holiday.sk-SK15.date=20211226
 holiday.sk-SK16.name=Deň vzniku Slovenskej republiky
 holiday.sk-SK16.date=20220101
 holiday.sk-SK17.name=Zjavenie Pána / Traja králi
 holiday.sk-SK17.date=20220106
 holiday.sk-SK18.name=Veľký piatok
 holiday.sk-SK18.date=20220415
 holiday.sk-SK19.name=Veľkonočný pondelok
 holiday.sk-SK19.date=20220418
 holiday.sk-SK20.name=Sviatok práce
 holiday.sk-SK20.date=20220501
 holiday.sk-SK21.name=Deň víťazstva nad fašizmom
 holiday.sk-SK21.date=20220508
 holiday.sk-SK22.name=Sviatok svätého Cyrila a Metoda
 holiday.sk-SK22.date=20220705
 holiday.sk-SK23.name=Výročie SNP
 holiday.sk-SK23.date=20220829
 holiday.sk-SK24.name=Deň Ústavy Slovenskej republiky
 holiday.sk-SK24.date=20220901
 holiday.sk-SK25.name=Sedembolestná Panna Mária
 holiday.sk-SK25.date=20220915
 holiday.sk-SK26.name=Sviatok všetkých svätých
 holiday.sk-SK26.date=20221101
 holiday.sk-SK27.name=Deň boja za slobodu a demokraciu
 holiday.sk-SK27.date=20221117
 holiday.sk-SK28.name=Štedrý deň
 holiday.sk-SK28.date=20221224
 holiday.sk-SK29.name=Prvý sviatok vianočný
 holiday.sk-SK29.date=20221225
 holiday.sk-SK30.name=Druhý sviatok vianočný
 holiday.sk-SK30.date=20221226
--- a/doc/rc/holidays.sv-FI.rc
+++ b/doc/rc/holidays.sv-FI.rc
@@ -0,0 +1,81 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
 # https://holidata.net/sv-FI/2021.json
 # https://holidata.net/sv-FI/2022.json
 #
 # Copyright 2006 - 2021, Tomas Babej, 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.
 #
 # https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.sv-FI1.name=Nyårsdagen
 holiday.sv-FI1.date=20210101
 holiday.sv-FI2.name=Trettondedagen
 holiday.sv-FI2.date=20210106
 holiday.sv-FI3.name=Långfredagen
 holiday.sv-FI3.date=20210402
 holiday.sv-FI4.name=Påskdagen
 holiday.sv-FI4.date=20210404
 holiday.sv-FI5.name=Annandag påsk
 holiday.sv-FI5.date=20210405
 holiday.sv-FI6.name=Första maj
 holiday.sv-FI6.date=20210501
 holiday.sv-FI7.name=Kristi himmelfärdsdag
 holiday.sv-FI7.date=20210513
 holiday.sv-FI8.name=Pingst
 holiday.sv-FI8.date=20210523
 holiday.sv-FI9.name=Midsommardagen
 holiday.sv-FI9.date=20210626
 holiday.sv-FI10.name=Alla helgons dag
 holiday.sv-FI10.date=20211106
 holiday.sv-FI11.name=Självständighetsdagen
 holiday.sv-FI11.date=20211206
 holiday.sv-FI12.name=Juldagen
 holiday.sv-FI12.date=20211225
 holiday.sv-FI13.name=Annandag jul
 holiday.sv-FI13.date=20211226
 holiday.sv-FI14.name=Nyårsdagen
 holiday.sv-FI14.date=20220101
 holiday.sv-FI15.name=Trettondedagen
 holiday.sv-FI15.date=20220106
 holiday.sv-FI16.name=Långfredagen
 holiday.sv-FI16.date=20220415
 holiday.sv-FI17.name=Påskdagen
 holiday.sv-FI17.date=20220417
 holiday.sv-FI18.name=Annandag påsk
 holiday.sv-FI18.date=20220418
 holiday.sv-FI19.name=Första maj
 holiday.sv-FI19.date=20220501
 holiday.sv-FI20.name=Kristi himmelfärdsdag
 holiday.sv-FI20.date=20220526
 holiday.sv-FI21.name=Pingst
 holiday.sv-FI21.date=20220605
 holiday.sv-FI22.name=Midsommardagen
 holiday.sv-FI22.date=20220625
 holiday.sv-FI23.name=Alla helgons dag
 holiday.sv-FI23.date=20221105
 holiday.sv-FI24.name=Självständighetsdagen
 holiday.sv-FI24.date=20221206
 holiday.sv-FI25.name=Juldagen
 holiday.sv-FI25.date=20221225
 holiday.sv-FI26.name=Annandag jul
 holiday.sv-FI26.date=20221226
--- 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
-# http://holidata.net/sv-SE/2015.json
+# https://holidata.net/sv-SE/2021.json
-# http://holidata.net/sv-SE/2016.json
+# https://holidata.net/sv-SE/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,71 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.sv-SE1.name=Nyårsdagen
-holiday.sv-SE1.date=20150101
+holiday.sv-SE1.date=20210101
 holiday.sv-SE2.name=Trettondedag jul
-holiday.sv-SE2.date=20150106
+holiday.sv-SE2.date=20210106
 holiday.sv-SE3.name=Långfredagen
-holiday.sv-SE3.date=20150403
+holiday.sv-SE3.date=20210402
 holiday.sv-SE4.name=Påskdagen
-holiday.sv-SE4.date=20150405
+holiday.sv-SE4.date=20210404
 holiday.sv-SE5.name=Annandag påsk
-holiday.sv-SE5.date=20150406
+holiday.sv-SE5.date=20210405
-holiday.sv-SE6.name=Valborgmässoafton
+holiday.sv-SE6.name=Första maj
-holiday.sv-SE6.date=20150430
+holiday.sv-SE6.date=20210501
-holiday.sv-SE7.name=Första maj
+holiday.sv-SE7.name=Kristi himmelsfärdsdag
-holiday.sv-SE7.date=20150501
+holiday.sv-SE7.date=20210513
-holiday.sv-SE8.name=Kristi Himmelsfärdsdag
+holiday.sv-SE8.name=Pingstdagen
-holiday.sv-SE8.date=20150514
+holiday.sv-SE8.date=20210523
-holiday.sv-SE9.name=Pingstdagen
+holiday.sv-SE9.name=Nationaldagen
-holiday.sv-SE9.date=20150524
+holiday.sv-SE9.date=20210606
-holiday.sv-SE10.name=Nationaldagen
+holiday.sv-SE10.name=Midsommarafton
-holiday.sv-SE10.date=20150606
+holiday.sv-SE10.date=20210625
-holiday.sv-SE11.name=Midsommarafton
+holiday.sv-SE11.name=Midsommardagen
-holiday.sv-SE11.date=20150619
+holiday.sv-SE11.date=20210626
-holiday.sv-SE12.name=Midsommardagen
+holiday.sv-SE12.name=Alla helgons dag
-holiday.sv-SE12.date=20150620
+holiday.sv-SE12.date=20211106
-holiday.sv-SE13.name=Alla Helgons Dag
+holiday.sv-SE13.name=Julafton
-holiday.sv-SE13.date=20151031
+holiday.sv-SE13.date=20211224
-holiday.sv-SE14.name=Julafton
+holiday.sv-SE14.name=Juldagen
-holiday.sv-SE14.date=20151224
+holiday.sv-SE14.date=20211225
-holiday.sv-SE15.name=Juldagen
+holiday.sv-SE15.name=Annandag jul
-holiday.sv-SE15.date=20151225
+holiday.sv-SE15.date=20211226
-holiday.sv-SE16.name=Annandag jul
+holiday.sv-SE16.name=Nyårsafton
-holiday.sv-SE16.date=20151226
+holiday.sv-SE16.date=20211231
-holiday.sv-SE17.name=Nyårsafton
+holiday.sv-SE17.name=Nyårsdagen
-holiday.sv-SE17.date=20151231
+holiday.sv-SE17.date=20220101
-holiday.sv-SE18.name=Nyårsdagen
+holiday.sv-SE18.name=Trettondedag jul
-holiday.sv-SE18.date=20160101
+holiday.sv-SE18.date=20220106
-holiday.sv-SE19.name=Trettondedag jul
+holiday.sv-SE19.name=Långfredagen
-holiday.sv-SE19.date=20160106
+holiday.sv-SE19.date=20220415
-holiday.sv-SE20.name=Långfredagen
+holiday.sv-SE20.name=Påskdagen
-holiday.sv-SE20.date=20160325
+holiday.sv-SE20.date=20220417
-holiday.sv-SE21.name=Påskdagen
+holiday.sv-SE21.name=Annandag påsk
-holiday.sv-SE21.date=20160327
+holiday.sv-SE21.date=20220418
-holiday.sv-SE22.name=Annandag påsk
+holiday.sv-SE22.name=Första maj
-holiday.sv-SE22.date=20160328
+holiday.sv-SE22.date=20220501
-holiday.sv-SE23.name=Valborgmässoafton
+holiday.sv-SE23.name=Kristi himmelsfärdsdag
-holiday.sv-SE23.date=20160430
+holiday.sv-SE23.date=20220526
-holiday.sv-SE24.name=Första maj
+holiday.sv-SE24.name=Pingstdagen
-holiday.sv-SE24.date=20160501
+holiday.sv-SE24.date=20220605
-holiday.sv-SE25.name=Kristi Himmelsfärdsdag
+holiday.sv-SE25.name=Nationaldagen
-holiday.sv-SE25.date=20160505
+holiday.sv-SE25.date=20220606
-holiday.sv-SE26.name=Pingstdagen
+holiday.sv-SE26.name=Midsommarafton
-holiday.sv-SE26.date=20160515
+holiday.sv-SE26.date=20220624
-holiday.sv-SE27.name=Nationaldagen
+holiday.sv-SE27.name=Midsommardagen
-holiday.sv-SE27.date=20160606
+holiday.sv-SE27.date=20220625
-holiday.sv-SE28.name=Midsommarafton
+holiday.sv-SE28.name=Alla helgons dag
-holiday.sv-SE28.date=20160624
+holiday.sv-SE28.date=20221105
-holiday.sv-SE29.name=Midsommardagen
+holiday.sv-SE29.name=Julafton
-holiday.sv-SE29.date=20160625
+holiday.sv-SE29.date=20221224
-holiday.sv-SE30.name=Alla Helgons Dag
+holiday.sv-SE30.name=Juldagen
-holiday.sv-SE30.date=20161105
+holiday.sv-SE30.date=20221225
-holiday.sv-SE31.name=Julafton
+holiday.sv-SE31.name=Annandag jul
-holiday.sv-SE31.date=20161224
+holiday.sv-SE31.date=20221226
-holiday.sv-SE32.name=Juldagen
+holiday.sv-SE32.name=Nyårsafton
-holiday.sv-SE32.date=20161225
+holiday.sv-SE32.date=20221231
 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
-# http://holidata.net/tr-TR/2015.json
+# https://holidata.net/tr-TR/2021.json
-# http://holidata.net/tr-TR/2016.json
+# https://holidata.net/tr-TR/2022.json
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 holiday.tr-TR1.name=Yılbaşı
-holiday.tr-TR1.date=20150101
+holiday.tr-TR1.date=20210101
 holiday.tr-TR2.name=Ulusal Egemenlik ve Çocuk Bayramı
-holiday.tr-TR2.date=20150423
+holiday.tr-TR2.date=20210423
 holiday.tr-TR3.name=Emek ve Dayanışma Günü
-holiday.tr-TR3.date=20150501
+holiday.tr-TR3.date=20210501
-holiday.tr-TR4.name=Atatürk'ü Anma Gençlik ve Spor Bayramı
+holiday.tr-TR4.name=Ramazan Bayramı (1. Gün)
-holiday.tr-TR4.date=20150519
+holiday.tr-TR4.date=20210513
-holiday.tr-TR5.name=Zafer Bayramı
+holiday.tr-TR5.name=Ramazan Bayramı (2. Gün)
-holiday.tr-TR5.date=20150830
+holiday.tr-TR5.date=20210514
-holiday.tr-TR6.name=Cumhuriyet Bayramı
+holiday.tr-TR6.name=Ramazan Bayramı (3. Gün)
-holiday.tr-TR6.date=20151029
+holiday.tr-TR6.date=20210515
-holiday.tr-TR7.name=Ramazan Bayramı 1
+holiday.tr-TR7.name=Atatürk'ü Anma, Gençlik ve Spor Bayramı
-holiday.tr-TR7.date=20150717
+holiday.tr-TR7.date=20210519
-holiday.tr-TR8.name=Ramazan Bayramı 2
+holiday.tr-TR8.name=Demokrasi ve Milli Birlik Günü
-holiday.tr-TR8.date=20150718
+holiday.tr-TR8.date=20210715
-holiday.tr-TR9.name=Ramazan Bayramı 3
+holiday.tr-TR9.name=Kurban Bayramı (1. Gün)
-holiday.tr-TR9.date=20150719
+holiday.tr-TR9.date=20210720
-holiday.tr-TR10.name=Kurban Bayramı 1
+holiday.tr-TR10.name=Kurban Bayramı (2. Gün)
-holiday.tr-TR10.date=20150923
+holiday.tr-TR10.date=20210721
-holiday.tr-TR11.name=Kurban Bayramı 2
+holiday.tr-TR11.name=Kurban Bayramı (3. Gün)
-holiday.tr-TR11.date=20150924
+holiday.tr-TR11.date=20210722
-holiday.tr-TR12.name=Kurban Bayramı 3
+holiday.tr-TR12.name=Kurban Bayramı (4. Gün)
-holiday.tr-TR12.date=20150925
+holiday.tr-TR12.date=20210723
-holiday.tr-TR13.name=Kurban Bayramı 4
+holiday.tr-TR13.name=Zafer Bayramı
-holiday.tr-TR13.date=20150926
+holiday.tr-TR13.date=20210830
-holiday.tr-TR14.name=Yılbaşı
+holiday.tr-TR14.name=Cumhuriyet Bayramı
-holiday.tr-TR14.date=20160101
+holiday.tr-TR14.date=20211029
-holiday.tr-TR15.name=Ulusal Egemenlik ve Çocuk Bayramı
+holiday.tr-TR15.name=Yılbaşı
-holiday.tr-TR15.date=20160423
+holiday.tr-TR15.date=20220101
-holiday.tr-TR16.name=Emek ve Dayanışma Günü
+holiday.tr-TR16.name=Ulusal Egemenlik ve Çocuk Bayramı
-holiday.tr-TR16.date=20160501
+holiday.tr-TR16.date=20220423
-holiday.tr-TR17.name=Atatürk'ü Anma Gençlik ve Spor Bayramı
+holiday.tr-TR17.name=Emek ve Dayanışma Günü
-holiday.tr-TR17.date=20160519
+holiday.tr-TR17.date=20220501
-holiday.tr-TR18.name=Zafer Bayramı
+holiday.tr-TR18.name=Ramazan Bayramı (1. Gün)
-holiday.tr-TR18.date=20160830
+holiday.tr-TR18.date=20220502
-holiday.tr-TR19.name=Cumhuriyet Bayramı
+holiday.tr-TR19.name=Ramazan Bayramı (2. Gün)
-holiday.tr-TR19.date=20161029
+holiday.tr-TR19.date=20220503
-holiday.tr-TR20.name=Ramazan Bayramı 1
+holiday.tr-TR20.name=Ramazan Bayramı (3. Gün)
-holiday.tr-TR20.date=20160705
+holiday.tr-TR20.date=20220504
-holiday.tr-TR21.name=Ramazan Bayramı 2
+holiday.tr-TR21.name=Atatürk'ü Anma, Gençlik ve Spor Bayramı
-holiday.tr-TR21.date=20160706
+holiday.tr-TR21.date=20220519
-holiday.tr-TR22.name=Ramazan Bayramı 3
+holiday.tr-TR22.name=Kurban Bayramı (1. Gün)
-holiday.tr-TR22.date=20160707
+holiday.tr-TR22.date=20220709
-holiday.tr-TR23.name=Kurban Bayramı 1
+holiday.tr-TR23.name=Kurban Bayramı (2. Gün)
-holiday.tr-TR23.date=20160912
+holiday.tr-TR23.date=20220710
-holiday.tr-TR24.name=Kurban Bayramı 2
+holiday.tr-TR24.name=Kurban Bayramı (3. Gün)
-holiday.tr-TR24.date=20160913
+holiday.tr-TR24.date=20220711
-holiday.tr-TR25.name=Kurban Bayramı 3
+holiday.tr-TR25.name=Kurban Bayramı (4. Gün)
-holiday.tr-TR25.date=20160914
+holiday.tr-TR25.date=20220712
-holiday.tr-TR26.name=Kurban Bayramı 4
+holiday.tr-TR26.name=Demokrasi ve Milli Birlik Günü
-holiday.tr-TR26.date=20160915
+holiday.tr-TR26.date=20220715
 holiday.tr-TR27.name=Zafer Bayramı
 holiday.tr-TR27.date=20220830
 holiday.tr-TR28.name=Cumhuriyet Bayramı
 holiday.tr-TR28.date=20221029
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://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 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://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 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://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 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,12 +20,12 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 # Colors used are based on the Solarized palette created by Ethan Schoonover
-# <http://ethanschoonover.com/solarized>
+# <https://ethanschoonover.com/solarized>
 #
 # This theme was designed to work with a terminal application that is using a
 # Solarized "Dark" color theme, otherwise colors will look odd. Solarized
@@ -74,7 +74,7 @@ color.uda.priority.L=bold green #color11
 # Tags
 color.tag.next=
 color.tag.none=
-color.tagged=color10
+color.tagged=
 # Due
 color.due=color9
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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,12 +20,12 @@
 # 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
+# https://www.opensource.org/licenses/mit-license.php
 #
 ###############################################################################
 # Colors used are based on the Solarized palette created by Ethan Schoonover
-# <http://ethanschoonover.com/solarized>
+# <https://ethanschoonover.com/solarized>
 #
 # This theme was designed to work with a terminal application that is using a
 # Solarized "Dark" color theme, otherwise colors will look odd. Solarized
@@ -74,7 +74,7 @@ color.uda.priority.L=bold color14
 # Tags
 color.tag.next=
 color.tag.none=
-color.tagged=color14
+color.tagged=
 # Due
 color.due=color9
--- 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
@@ -0,0 +1,122 @@
 version: '3'
 services:
  test-centos7:
    build:
        context: .
        dockerfile: test/docker/centos7
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-centos8:
    build:
        context: .
        dockerfile: test/docker/centos8
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-fedora32:
    build:
        context: .
        dockerfile: test/docker/fedora32
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-fedora33:
    build:
        context: .
        dockerfile: test/docker/fedora33
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-fedora34:
    build:
        context: .
        dockerfile: test/docker/fedora34
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-fedora35:
    build:
        context: .
        dockerfile: test/docker/fedora35
    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-ubuntu2004:
    build:
        context: .
        dockerfile: test/docker/ubuntu2004
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-ubuntu2104:
    build:
        context: .
        dockerfile: test/docker/ubuntu2104
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-ubuntu2110:
    build:
        context: .
        dockerfile: test/docker/ubuntu2110
    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-opensuse15:
    build:
        context: .
        dockerfile: test/docker/opensuse15
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
  test-arch:
    build:
        context: .
        dockerfile: test/docker/arch
    network_mode: "host"
    security_opt:
      - label=type:container_runtime_t
    tty: true
--- a/index.html
+++ b/index.html
@@ -0,0 +1 @@
 Taskwarrior Docs
--- a/performance/CMakeLists.txt
+++ b/performance/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
 add_custom_target (performance ./run_perf
                               DEPENDS task_executable
--- a/performance/load
+++ b/performance/load
--- a/performance/sample-text.txt
+++ b/performance/sample-text.txt
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,6 +1,8 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.0)
-install (DIRECTORY bash fish vim zsh hooks
+install (DIRECTORY bash fish vim hooks
         DESTINATION ${TASK_DOCDIR}/scripts)
 install (FILES zsh/_task
         DESTINATION share/zsh/site-functions)
 install (DIRECTORY add-ons
         DESTINATION ${TASK_DOCDIR}/scripts
         FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
--- 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/#exts
+https://taskwarrior.org/tools
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 ################################################################################
 ##
-## Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
+## Copyright 2006 - 2021, Tomas Babej, 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.
 ##
-## http://www.opensource.org/licenses/mit-license.php
+## https://www.opensource.org/licenses/mit-license.php
 ##
 ################################################################################
@@ -99,7 +99,7 @@ Schwyz:
                     --region Schwyz \
                     --file holidays.de-CH.rc
-See http://holidata.net for details of supported locales and regions.
+See https://holidata.net for details of supported locales and regions.
 It is recommended that you regularly update your holiday files.  Not only does
 this keep your holiday data current, but allows for corrected data to be used.
@@ -130,8 +130,8 @@ my $current = (localtime (time))[5] + 1900;
 my $next    = $current + 1;
 # Construct the holidata.net URL.
-my $url_current = "http://holidata.net/${locale}/${current}.json";
+my $url_current = "https://holidata.net/${locale}/${current}.json";
-my $url_next    = "http://holidata.net/${locale}/${next}.json";
+my $url_next    = "https://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 - 2016, Paul Beckingham, Federico Hernandez.\n",
+        "# Copyright 2006 - 2021, Tomas Babej, 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",
-        "# http://www.opensource.org/licenses/mit-license.php\n",
+        "# https://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 - 2016, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://www.opensource.org/licenses/mit-license.php
 #
 ################################################################################
 #
@@ -46,18 +46,20 @@
 #
 #    *) Go to the project's website at
 #
-#       http://taskwarrior.org
+#       https://taskwarrior.org
 #
 ################################################################################
 #the following variable is substituted for by ../../test/bash_completion.t
-taskcommand='task rc.verbose:nothing rc.confirmation:no rc.hooks:off'
+taskbin='task'
 taskrc=''
 taskcommand="rc.verbose:nothing rc.confirmation:no rc.hooks:off ${taskrc}"
 _task_get_tags() {
-    $taskcommand _tags
+    "$taskbin" $taskcommand _tags
 }
 _task_get_config() {
-    $taskcommand _config
+    "$taskbin" $taskcommand _config
 }
 _task_offer_priorities() {
@@ -65,14 +67,14 @@ _task_offer_priorities() {
 }
 _task_offer_projects() {
-    COMPREPLY=( $(compgen -W "$($taskcommand _projects)" -- ${cur/*:/}) )
+    COMPREPLY=( $(compgen -W "$("$taskbin" $taskcommand _projects)" -- ${cur/*:/}) )
 }
 _task_offer_contexts() {
-    COMPREPLY=( $(compgen -W "$($taskcommand _context) define delete list none show" -- $cur) )
+    COMPREPLY=( $(compgen -W "$("$taskbin" $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=$("$taskbin" $taskcommand show | grep 'alias.*context' | cut -d' ' -f1 | cut -d. -f2)
 _task()
 {
@@ -92,9 +94,9 @@ _task()
 #   echo "prev='$prev'"
 #   echo "prev2='$prev2'"
-    abbrev_min=$($taskcommand show | grep "abbreviation.minimum" | awk {'print  $2'})
+    abbrev_min=$("$taskbin" $taskcommand show | grep "abbreviation.minimum" | awk {'print  $2'})
-    commands_aliases=$(echo $($taskcommand _commands; $taskcommand _aliases) | tr " " "\n"|sort|tr "\n" " ")
+    commands_aliases=$(echo $("$taskbin" $taskcommand _commands; "$taskbin" $taskcommand _aliases) | tr " " "\n"|sort|tr "\n" " ")
-    opts="$commands_aliases $($taskcommand _columns)"
+    opts="$commands_aliases $("$taskbin" $taskcommand _columns)"
    case "${prev}" in
        $_task_context_alias|cont|conte|contex|context)
--- a/scripts/bash/task_functions.sh
+++ b/scripts/bash/task_functions.sh
@@ -1,26 +0,0 @@
 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
@@ -1,4 +1,4 @@
-# Taskwarrior completions for the Fish shell <http://fishshell.org>
+# Taskwarrior completions for the Fish shell <https://fishshell.com>
 #
 # taskwarrior - a command line task list manager.
 #
@@ -33,7 +33,7 @@
 # set -g task_complete_attribute_modifiers yes
 #
 #
-# Copyright 2014 - 2016, Roman Inflianskas <infroma@gmail.com>
+# Copyright 2014 - 2021, 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.
 #
-# http://www.opensource.org/licenses/mit-license.php
+# https://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.
@@ -88,7 +88,7 @@ end
 function __fish.task.current.command
  # find command in commandline by list intersection
-  begin; commandline -pco; and __fish.task.list._command all | cut -d '	' -f 1; end | sort | uniq -d | xargs
+  begin; commandline -pco; and echo $__fish_task_static_commands; end | sort | uniq -d | xargs
 end
 function __fish.task.before_command
@@ -104,6 +104,10 @@ end
 function __fish.task.need_to_complete.attr_value
  __fish.task.need_to_complete.attr_name
  or return 1
  # only start completion when there's a colon in attr_name
  set -l cmd (commandline -ct)
  string match -q -- "*:*" "$cmd[-1]"
 end
 function __fish.task.need_to_complete.command
@@ -123,6 +127,14 @@ function __fish.task.need_to_complete.filter
  __fish.task.before_command
 end
 function __fish.task.need_to_complete.tag
  __fish.task.need_to_complete.attr_name
  or return 1
  set -l cmd (commandline -ct)
  # only start complete when supplied + or -
  string match -qr -- "^[+-][^+-]*" "$cmd[-1]"
 end
 function __fish.task.need_to_complete.id
  __fish.task.need_to_complete.filter
 end
@@ -143,9 +155,16 @@ function __fish.task.token_clean
 end
 function __fish.task.list.attr_name
-  task _columns | sed 's/$/:	attribute/g'
+  # # BUG: doesn't support file completion
-  # BUG: doesn't support file completion
+  for attr in (task _columns)
-  echo rc
+    if set -l idx (contains -i -- $attr $__fish_task_static_attr_desc_keys)
      # use builtin friendly description
      echo -e "$attr:\tattribute:$__fish_task_static_attr_desc_vals[$idx]"
    else
      echo -e "$attr:\tattribute"
    end
  end
  echo -e "rc\tConfiguration for taskwarrior"
 end
 function __fish.task.list.attr_value
@@ -158,7 +177,6 @@ function __fish.task.list.attr_value
      end
    end
  end
    __fish.task.list.tag
 end
 function __fish.task.list.attr_value_by_name
@@ -168,7 +186,11 @@ function __fish.task.list.attr_value_by_name
      __fish.task.list.rc
    case 'depends' 'limit' 'priority' 'status'
      __fish.task.combos_simple $attr (__fish.task.list $attr)
-    # case 'description' 'due' 'entry' 'end' 'start' 'project' 'recur' 'until' 'wait'
+    case 'recur'
      __fish.task.combos_simple $attr (__fish.task.list.date_freq)
    case 'due' 'until' 'wait' 'entry' 'end' 'start' 'scheduled'
      __fish.task.combos_simple $attr (__fish.task.list.dates)
    # case 'description' 'project'
    case '*'
      if [ "$task_complete_attribute_modifiers" = 'yes' ]; and echo (commandline -ct) | grep -q '\.'
        __fish.task.combos_with_mods $attr (__fish.task.list $attr)
@@ -179,20 +201,16 @@ function __fish.task.list.attr_value_by_name
 end
 function __fish.task.list._command
-  # Removed args until TW-1404 is fixed.
+  echo -e $__fish_task_static_commands_with_desc
  #__fish.task.zsh commands $argv
  __fish.task.zsh commands
 end
 function __fish.task.list.command
  # ignore special commands
-  __fish.task.list._command $argv | grep -Ev '^_'
+  __fish.task.list._command $argv | command grep -Ev '^_'
 end
 function __fish.task.list.command_mods
-  for command in 'add' 'annotate' 'append' 'delete' 'done' 'duplicate' 'log' 'modify' 'prepend' 'start' 'stop'
+  echo -e $__fish_task_static_command_mods
    echo $command
  end
 end
 function __fish.task.list.config
@@ -204,29 +222,55 @@ function __fish.task.list.depends
 end
 function __fish.task.list.description
-  __fish.task.zsh ids $argv | cut -d '	' -f 2-
+  __fish.task.zsh ids $argv | awk -F"\t" '{print $2 "\tid=" $1}'
 end
 function __fish.task.list.id
  set show_type $argv[1]
  if test -z $show_type
    task _ids
-  else if [  $show_type = 'with_description' ]
+  else if [ $show_type = 'with_description' ]
    __fish.task.zsh ids
  end
 end
 function __fish.task.list.date_freq
  set -l cmd (commandline -ct)
  if set -l user_input_numeric (echo $cmd[-1] | grep -o '[0-9]\+')
    # show numeric freq like 2d, 4m, etc.
    echo -e (string replace --all -r "^|\n" "\n$user_input_numeric" $__fish_task_static_freq_numeric | string collect)
  else
    echo -e $__fish_task_static_freq
  end
 end
 function __fish.task.list.dates
  set -l cmd (commandline -ct)
  if set -l user_input_numeric (echo $cmd[-1] | grep -o '[0-9]\+')
    # show numeric date like 2hrs, 4th, etc.
    echo -e (string replace --all -r "^|\n" "\n$user_input_numeric" $__fish_task_static_reldates | string collect)
    # special cases for 1st, 2nd and 3rd, and 4-0th
    set -l suffix 'th' '4th, 5th, etc.'
    if string match -q -- "*1" $user_input_numeric
      set suffix 'st' 'first'
    else if string match -q -- "*2" $user_input_numeric
      set suffix 'nd' 'second'
    else if string match -q -- "*3" $user_input_numeric
      set suffix 'rd' 'third'
    end
    echo -e $user_input_numeric"$suffix[1]\t$suffix[2]"
  else
    echo -e $__fish_task_static_dates
  end
 end
 # Attribure modifiers (DEPRECATED since 2.4.0)
 function __fish.task.list.mod
-  for mod in 'before' 'after' 'over' 'under' 'none' 'is' 'isnt' 'has' 'hasnt' 'startswith' 'endswith' 'word' 'noword'
+  echo -e $__fish_task_static_mod
    echo $mod
  end
 end
 function __fish.task.list.priority
-  for priority in 'H' 'M' 'L'
+  echo -e $__fish_task_static_priority
    echo $priority
  end
 end
 function __fish.task.list.project
@@ -234,23 +278,17 @@ function __fish.task.list.project
 end
 function __fish.task.list.rc
-  for value in (task _config)
+  task _config
    echo rc.$value:
  end
 end
 function __fish.task.list.status
-  echo pending
+  echo -e $__fish_task_static_status
  echo completed
  echo deleted
  echo waiting
 end
 function __fish.task.list.tag
-  for tag in (task _tags)
+  set -l tags (task _tags)
-    echo +$tag
+  printf -- '+%s\n' $tags
-    echo -$tag
+  printf -- '-%s\n' $tags
  end
 end
 function __fish.task.list.task
@@ -302,19 +340,110 @@ function __fish.task.complete
  set what $argv
  set list_command "__fish.task.list $what"
  set check_function "__fish.task.need_to_complete $what"
-  complete -c task -u -f -n $check_function -a "(eval $list_command)"
+  complete -c task -u -k -f -n $check_function -a "(eval $list_command)"
 end
-__fish.task.complete command all
+# static variables that won't changes even when taskw's data is modified
-__fish.task.complete command filter
+set __fish_task_static_commands_with_desc (__fish.task.zsh commands | sort | string collect)
 set __fish_task_static_commands (echo -e $__fish_task_static_commands_with_desc | cut -d '	' -f 1 | string collect)
 set __fish_task_static_command_mods (printf -- '%s\n' 'add' 'annotate' 'append' 'delete' 'done' 'duplicate' 'log' 'modify' 'prepend' 'start' 'stop' | string collect)
 set __fish_task_static_mod (printf -- '%s\n' 'before' 'after' 'over' 'under' 'none' 'is' 'isnt' 'has' 'hasnt' 'startswith' 'endswith' 'word' 'noword' | string collect)
 set __fish_task_static_status (printf -- '%s\tstatus\n' 'pending' 'completed' 'deleted' 'waiting' | string collect)
 set __fish_task_static_priority (printf -- '%s\n' 'H\tHigh' 'M\tMiddle' 'L\tLow' | string collect)
 set __fish_task_static_freq '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'
 set __fish_task_static_freq (printf -- '%s\n' $__fish_task_static_freq | sed 's/:/\t/' | string collect)
 set __fish_task_static_freq_numeric 'd:days' \
                                    'w:weeks' \
                                    'q:quarters' \
                                    'y:years'
 set __fish_task_static_freq_numeric (printf -- '%s\n' $__fish_task_static_freq_numeric | sed 's/:/\t/' | string collect)
 set __fish_task_static_freq_numeric 'd:days' \
                                    'w:weeks' \
                                    'q:quarters' \
                                    'y:years'
 set __fish_task_static_freq_numeric (printf -- '%s\n' $__fish_task_static_freq_numeric | sed 's/:/\t/' | string collect)
 set __fish_task_static_dates 'today:Today' \
                             'yesterday:Yesterday' \
                             'tomorrow: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' \
                             'goodfriday:Good Friday' \
                             'easter:Easter' \
                             'eastermonday:Easter Monday' \
                             'ascension:Ascension' \
                             'pentecost:Pentecost' \
                             'midsommar:Midsommar' \
                             'midsommarafton:Midsommarafton' \
                             'later:Later' \
                             'someday:Some Day'
 set __fish_task_static_dates (printf -- '%s\n' $__fish_task_static_dates | sed 's/:/\t/' | string collect)
 set __fish_task_static_reldates 'hrs:n hours' \
                                'day:n days' \
                                # '1st:first' \
                                # '2nd:second' \
                                # '3rd:third' \
                                # 'th:4th, 5th, etc.' \
                                'wks:weeks'
 set __fish_task_static_reldates (printf -- '%s\n' $__fish_task_static_reldates | sed 's/:/\t/' | string collect)
 # the followings are actually not used for autocomplete, but to retrieve friendly description that aren't present in internal command
 set  __fish_task_static_attr_desc_keys 'description' 'status' 'project' \
                                          'priority' 'due' 'recur' \
                                          'until' 'limit' 'wait' \
                                          'entry' 'end' 'start' \
                                          'scheduled' 'dependson'
 set  __fish_task_static_attr_desc_vals 'Task description text' 'Status of task - pending, completed, deleted, waiting' \
                                          'Project name' 'Task priority' 'Due date' 'Recurrence frequency' 'Expiration date' \
                                          'Desired number of rows in report' 'Date until task becomes pending' \
                                          'Date task was created' 'Date task was completed/deleted' 'Date task was started' \
                                          'Date task is scheduled to start' 'Other tasks that this task depends upon'
 # fish's auto-completion when multiple `complete` have supplied with '-k' flag, the last will be displayed first
 __fish.task.complete config
 __fish.task.complete attr_value
 __fish.task.complete attr_name
-__fish.task.complete config
+__fish.task.complete tag
 # __fish.task.complete command all
 # __fish.task.complete command filter
 # The following are static so we will expand it when initialised. Display underscore (internal) commands last
 set -l __fish_task_static_commands_underscore (echo -e $__fish_task_static_commands_with_desc | grep '^[_]' | string collect | string escape)
 set -l __fish_task_static_commands_normal (echo -e $__fish_task_static_commands_with_desc | grep '^[^_]' | string collect | string escape)
 complete -c task -u -k -f -n "__fish.task.before_command" -a "$__fish_task_static_commands_underscore"
 complete -c task -u -k -f -n "__fish.task.before_command" -a "$__fish_task_static_commands_normal"
 if [ "$task_complete_task" = 'yes' ]
-  __fish.task.complete task
+    __fish.task.complete task
 end
 if [ "$task_complete_id" = 'yes' ]
-  __fish.task.complete id with_description
+    __fish.task.complete id with_description
 end
--- 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/#exts`	`https://taskwarrior.org/tools`