Version number and release date for 2.4.0

Bumped version and date in task reference page
Unit Tests
2015-01-02 00:11:32 +01:00 · 2015-01-01 23:53:08 +01:00 · 2015-01-01 17:35:05 -05:00 · 2015-01-01 17:32:31 -05:00 · 2015-01-01 17:27:05 -05:00 · 2015-01-01 17:22:26 -05:00
742 changed files with 61112 additions and 29044 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,10 @@
 cmake.h
-auto.h
 commit.h
 Makefile
-*/*task
-*/*libtask.a
-*/*/libcommands.a
-*/*/libcolumns.a
+src/task
+src/libtask.a
+src/commands/libcommands.a
+src/columns/libcolumns.a
 *~
 .*.swp
 package-config/osx/binary/task
@@ -16,4 +15,5 @@ install_manifest.txt
 _CPack_Packages
 CPackConfig.cmake
 CPackSourceConfig.cmake
-doc/misc/tutorial
+patches
+*.exe
--- a/116
+++ b/116
@@ -2,14 +2,17 @@ The development of taskwarrior was made possible by the significant
 contributions of the following people:

  Paul Beckingham    (Principal Author)
-  Federico Hernandez (Package Maintainer & Contributing Author)
+  Federico Hernandez (Principal Author)
  David J Patrick    (Designer)
  John Florian       (Contributing Author)
  Cory Donnelly      (Contributing Author)
  Johannes Schlatow  (Contributing Author)
-  Dirk Deimeke       (Technical Advisor & Marketing)
+  Dirk Deimeke       (Technical Advisor & Evangelist)
  Wim Schuermann     (Contributing Author)
  Owen Clarke        (Contributing Author)
+  Louis-Claude Canon (Contributing Author)
+  Scott Kostyshak    (Contributing Author)
+  Renato Alves       (Contributing Author)

 The following submitted code, packages or analysis, and deserve special thanks:

@@ -69,6 +72,46 @@ The following submitted code, packages or analysis, and deserve special thanks:
  Steve Rader
  Luke Macken
  Sam Stuck
+  Christoph Robbert
+  Oleksii Tsai
+  Jörg Plate
+  Markus Kuhn
+  Erik Wenzel
+  Štěpán Henek
+  Haitham Gad
+  Fidel Mato
+  Justin Forest
+  Vincent Petithory
+  Rainer Müller
+  Jakub Wilk
+  Russell Steicke
+  YBSAR
+  Ben Armstrong
+  Tullio Facchinetti
+  Thomas Sullivan
+  Martin Natano
+  kili
+  jasper
+  Aaron Bieber
+  John West
+  Jeroen Budts
+  Zed Jorarard
+  Elias Probst
+  Natanael Copa
+  Marton Suranyi
+  Nicolas Appriou
+  Jochen Sprickerhof
+  Alexander Sulfrian
+  David Binderman
+  atomicules
+  catern
+  Tatjana Heuser
+  leowzukw
+  Richard Boß
+  Markus Beppler
+  Jeremy John Reeder
+  Roman Inflianskas
+  Łukasz Panek

 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -129,4 +172,71 @@ suggestions:
  Philipp Woelfel
  Tuomas Toivola
  Adam Gibbins
-
+  Ali Mousavi
+  Victor Roetman
+  Andy Spiegl
+  Ethan Schoonover
+  Paul Kishimoto
+  Jeff Schroeder
+  Bryan Kam
+  Nicholas Rabenau
+  Bruno Bigras
+  Hyde Stevenson
+  Martin U
+  Christoph Lange
+  Stephen Hay
+  Vlad Zhivotnev
+  Stanley G
+  Marek Vitek
+  Rene Vergara
+  Stéphane Pezennec
+  Jim B
+  Robert Gill
+  Robin Björklin
+  Jake Bell
+  Florian Hollerweger
+  Thomas Sullivan
+  Tim None
+  trHD
+  Benjamin Weber
+  alparo
+  Roy Zuo
+  Friedrich Heusler
+  Ben Armstrong
+  XTaran
+  John West
+  Dmitriy Matrosov
+  Michele Santullo
+  Scott Kroll
+  Kosta H
+  Hector Arciga
+  Jan Kunder
+  jck
+  Michele Vetturi
+  Jeremiah Marks
+  Profpatsch
+  Bernd Humpa
+  darkfeline
+  Onion
+  Milos Svantner
+  Christopher Roberts
+  Steffen Uhlig
+  Dirk Sarpe
+  Will Dietz
+  Charles Ulrich
+  Jack
+  Kevin Ballard
+  Sitaram Chamarty
+  lolilolicon
+  Lee Lieske
+  Peter Vitt
+  dev-zero
+  Petteri
+  Black Ops Testing
+  Jens Erat
+  Leon Feng
+  Tomas Babej
+  Nick Person
+  Arnoud K
+  Ozgur Akgun
+  David Costa
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,29 +2,50 @@ cmake_minimum_required (VERSION 2.8)
 set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required

 include (CheckFunctionExists)
+include (CheckStructHasMember)

 set (HAVE_CMAKE true)

 project (task)
-set (PROJECT_VERSION "2.0.0")
-
-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")
-SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
-SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
+set (PROJECT_VERSION "2.4.0")

 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)
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

+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)
  set (HAVE_COMMIT true)
@@ -44,14 +65,13 @@ set (PACKAGE_TARNAME "${PACKAGE}")
 set (PACKAGE_VERSION "${VERSION}")
 set (PACKAGE_STRING "${PACKAGE} ${VERSION}")

-message ("-- Looking for Lua51")
-find_package (Lua51)
-if (LUA51_FOUND)
-  message ("-- Found Lua51: ${LUA_LIBRARIES}")
-  set (HAVE_LIBLUA true)
-  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
-  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${LUA_LIBRARIES})
-endif (LUA51_FOUND)
+message ("-- Looking for GnuTLS")
+find_package (GnuTLS)
+if (GNUTLS_FOUND)
+  set (HAVE_LIBGNUTLS true)
+  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
+  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${GNUTLS_LIBRARIES})
+endif (GNUTLS_FOUND)

 #message ("-- Looking for pthread")
 #find_path (PTHREAD_INCLUDE_DIR pthread.h)
@@ -63,35 +83,53 @@ endif (LUA51_FOUND)
 #  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${PTHREAD_LIBRARIES})
 #endif (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)

-check_function_exists (random  HAVE_RANDOM)
-check_function_exists (srandom HAVE_SRANDOM)
+check_function_exists (timegm  HAVE_TIMEGM)
+check_function_exists (get_current_dir_name HAVE_GET_CURRENT_DIR_NAME)
+check_function_exists (wordexp HAVE_WORDEXP)
+
+check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
+check_struct_has_member ("struct stat" st_birthtime "sys/types.h;sys/stat.h" HAVE_ST_BIRTHTIME)

 message ("-- Looking for libuuid")
-if (DARWIN)
-  # Apple includes the uuid functions in their libc, rather than libuuid
-  set (HAVE_UUID true)
+if (DARWIN OR FREEBSD)
+  # Apple and FreeBSD include the uuid functions in their libc, rather than libuuid
  check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
-else (DARWIN)
+else (DARWIN OR FREEBSD)
  find_path    (UUID_INCLUDE_DIR   uuid/uuid.h)
  find_library (UUID_LIBRARY NAMES uuid)
  if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-    set (HAVE_UUID true)
    set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${UUID_INCLUDE_DIR})
    set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${UUID_LIBRARY})
    # Look for uuid_unparse_lower
    set (CMAKE_REQUIRED_INCLUDES  ${CMAKE_REQUIRED_INCLUDES}  ${UUID_INCLUDE_DIR})
    set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${UUID_LIBRARY})
    check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
+  else (UUID_INCLUDE_DIR AND UUID_LIBRARY)
+    message (FATAL_ERROR "-- libuuid not found.")
  endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-endif (DARWIN)
+endif (DARWIN OR FREEBSD)

-if (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
+if (HAVE_UUID_UNPARSE_LOWER)
  message ("-- Found libuuid")
-elseif (HAVE_UUID AND NOT HAVE_UUID_UNPARSE_LOWER)
+else (HAVE_UUID_UNPARSE_LOWER)
  message ("-- Found libuuid, using internal uuid_unparse_lower")
-else (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
-  message ("-- libuuid not found, using internal uuid")
-endif (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
+endif (HAVE_UUID_UNPARSE_LOWER)
+
+# Set the package language.
+if (LANGUAGE)
+  set (PACKAGE_LANGUAGE ${LANGUAGE})
+else (LANGUAGE)
+  set (PACKAGE_LANGUAGE 1)
+endif (LANGUAGE)
+
+set (LANGUAGE_ENG_USA 1)
+set (LANGUAGE_ESP_ESP 2)
+set (LANGUAGE_DEU_DEU 3)
+set (LANGUAGE_FRA_FRA 4)
+set (LANGUAGE_ITA_ITA 5)
+set (LANGUAGE_POR_PRT 6)
+set (LANGUAGE_EPO_RUS 7)
+set (LANGUAGE_POL_POL 8)

 message ("-- Configuring cmake.h")
 configure_file (
@@ -102,13 +140,15 @@ add_subdirectory (src)
 add_subdirectory (src/commands)
 add_subdirectory (src/columns)
 add_subdirectory (doc)
-add_subdirectory (i18n)
 add_subdirectory (scripts)
-if (EXISTS test)
+if (EXISTS ${CMAKE_SOURCE_DIR}/test)
  add_subdirectory (test EXCLUDE_FROM_ALL)
-endif (EXISTS test)
+endif (EXISTS ${CMAKE_SOURCE_DIR}/test)
+if (EXISTS performance)
+  add_subdirectory (performance EXCLUDE_FROM_ALL)
+endif (EXISTS performance)

-set (doc_FILES NEWS ChangeLog README INSTALL AUTHORS COPYING)
+set (doc_FILES NEWS ChangeLog README.md INSTALL AUTHORS COPYING)
 foreach (doc_FILE ${doc_FILES})
  install (FILES ${doc_FILE}  DESTINATION ${TASK_DOCDIR})
 endforeach (doc_FILE)
@@ -118,8 +158,8 @@ endforeach (doc_FILE)
 set (CPACK_SOURCE_GENERATOR "TGZ")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION})
 set (CPACK_SOURCE_IGNORE_FILES  "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSourceConfig"
-                                "_CPack_Packages" "cmake_install" "install_manifest"
-                                "Makefile$" "test" "package-config" "misc/*"
-                                "src/task$" "src/libtask.a" "auto.h$"
+                                "_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$")
 include (CPack)
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 taskwarrior - a command line task list manager.

-Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2015, 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
--- a/2960
+++ b/2960
--- a/222
+++ b/222
@@ -1,120 +1,192 @@
-This file is intended to convey the current efforts, priorities and needs of the
-codebase.  It is for developers looking for a way to start contributing.
+How to Build Taskwarrior

+  Obtain and build code:
+    $ git clone https://git.tasktools.org/scm/tm/task.git task.git
+    $ cd task.git
+    $ git checkout 2.4.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
+                                         # Install 'vramsteg' for blinkenlights
+    $ ./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 us a patch, make sure that patch is made against git HEAD. We
+  cannot apply patches made against the tarball source.
+
+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, as we are migrating from Perl to Python for our
+    test suite.
+
+  - 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 good.
+
+  - 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.

 Deprecated Code
  This is code that is going to be phased out soon, and therefore is not worth
-  fixing or documenting.  Don't waste your time.
+  fixing or documenting. Don't waste your time.

-  - There is no deprecated code at the moment.  I'm sure there will be soon.
+  - Priorities in core. This will be migrated to become a UDA as soon as we
+    have the right support in place for custom sorting.
+
+  - Nag feature.
+
+  - Attribute modifiers.

 New Code Needs
-  This is code that needs to be written, usually down at the C++ function level.
+  This is code that needs to be written.

-  - Need export_viz.yy script.  Any language.  This would have value as an
-    example, or template script serving as a starting-point for anyone who
-    needed this format.
-  - Need new export_xxx.yy scripts - the more the better.  Any language.
+  - Need export_viz.* script. Any language. This would have value as an example
+    or template script serving as a starting-point for anyone who needed this
+    format.
+  - Need new export_xxx.* scripts - the more the better. Any language.
  - The JSON.{h,cpp} code is fast and efficient up to a point, but has a non-
-    linear performance curve, implying a slowdown due to fragmentation.  Fix it.
-  - Need a function that can optimize color codes.  For example, if a string
-    contains this:
-      <red>one two </red><red>three four</red>
-    It can be shortened to:
-      <red>one two three four</red>
-    This is only possible if there is nothing between </red> and <red> and the
-    colors match.
+    linear performance curve, implying a slowdown due to fragmentation, but who
+    know? Find it, fix it.
+  - 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:

-Documentation Needed
-  Various forms of documentation that are needed, or are in need of review or
-  update.
+      https://bug.tasktools.org/browse/EX

-  - Wiki/How-To: Date Handling
-  - Wiki/How-To: Custom Reports, including performance considerations
-  - Wiki/How-To: Aliases, particularly new enhanced aliases
-  - Wiki/Features: All sections
+    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:
+  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
+  2. Regression tests that ensure certain bugs are fixed and stay fixed. These
     tests are named bug.NNN.t where NNN refers to the Redmine issue 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,
+  3. Small feature tests. When small features are added, we would like small,
     low-level feature tests named feature.NNN.t, where NNN is the Redmine
     issue number.
-  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
+  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 mainly written in Perl, and all use TAP.  Here is how to get the
-  code and run the test suite:
-     git clone git://tasktools.org:task.git
-     cd task.git
-     cmake .
-     make
-     make test
-
-  Alternately, you go to the test directory and run the following:
-
-     cd task.git/test
-     make
-     make test
-
-  Either way, a TAP file 'all.log' is written that contains all test results.
-  once this file is created, you can see the failing tests using this script:
-
-    task.git/test/problems
-
-  If you make a habit of running the test suite, consider downloading the
-  vramsteg utility to show a colorful progress bar, from:
-
-    git://tasktools.org/vramsteg.git     
+  The tests are mainly written in Perl, and all use TAP. We want them all to be
+  eventually replaced by Python, so we are now only accepting new tests that use
+  the Python-based approach you can see in some of the existing tests.

  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.
  - The basic.t unit tests are a misnomer, and should be either removed or
-    renamed.  We have long talked of 'basic functionality' that includes add,
-    delete, done, and list commands.  We need unit tests that prove that basic
-    functionality is working, and it should be called basic.t.
-  - None of the current unit tests remove the 'extensions' directory, and they
-    all should.
+    renamed. We have long talked of 'basic functionality' that includes add,
+    delete, done, and list commands. We need unit tests that prove that basic
+    functionality is working, and the file containing them should be called
+    basic.t.
  - Test propagation of modifications to recurring tasks.
  - Test regex support.
-  - Need unit tests for each bug in the issue list, if suitable.
-  - We have bugs in the unit tests that only manifest on days such as December
-    31st.  Clearly there is some bad date math going on, most likely in the
-    tests themselves, rather than in taskwarrior.
+  - Need unit tests for each bug in the issue list that is marked with the
+    'needsTest' label.

-  * Note that running the unit tests require the Perl JSON module to be
-    installed.
+  Note that running the unit tests currently requires the Perl JSON module to
+  be installed.
+
+  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.

-  - None.
+  - All columns/Col*::validate methods.
+  - New columns/Col*::modify methods.

 Current Codebase Condition

  'master' branch:
-    - 1.9.4 release, current, locked.
+    - 2.3.0 Current release, locked.

-  '2.0.0' branch:
-    - Rapidly approaching completion, and merged to master.
-
-  '2.0.1' branch:
-    - Will be ready for any emergency fixes.
-
-  '2.1.0' branch:
-    - Future development effort.
+  '2.4.0' branch:
+    - Current development branch with new command line parser, expressions,
+      and heading for beta soon.

 ---

-2012-03-03 Updated text, removed old history info.
+2014-10-12 Updated for 2.4.0
--- a/141
+++ b/141
@@ -3,67 +3,73 @@ Startup
  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
+  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
+  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
+  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
+  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 several passes over the command line.  For example, the task
-  command determines whether subsequent arguments are interpreted as part of a
-  filter or set of modifications.
+  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 Parser 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 call its execute method.
+  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
+  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
+  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.
+  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,
+  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.
+  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, synching, and parsing details.  It is
-  also responsible for minimizing reads, writes and parsing of data files.
+  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.
+  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
+  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
+  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.
+  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.
@@ -71,13 +77,12 @@ GC

 Files
  The data files used are all kept in the rc.data.location directory, which
-  defaults to ~/.task.  The files are:
+  defaults to ~/.task. The files are:

    pending.data
    completed.data
    undo.data
    backlog.data
-    synch.key

  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.
@@ -86,35 +91,35 @@ Files

  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 and the
-  'merge' command.
+  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 the task server.  It grows unbounded between 'synch'
-  commands.
-
-  The synch.key file contains a synch receipt that is used to optimize synch
-  operations.
+  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 (Arg objects) are grouped into
-  a set by the A3 (Args) object according to whether the command found is a
-  read or write command.
+  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 Command::filter method for applying a filter to a set of tasks,
-  yielding a result set.  It does this by creating an expression from the
-  filter using the E9 object, then evaluating the expression for each task,
-  such that the result set contains only tasks for which the expression
-  evaluates to Boolean true.
+  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
+  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
+  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.
@@ -124,16 +129,16 @@ Sorting


 Render
-  There are two rendering objects, ViewTask and ViewText.  These both have the
-  same tabular grid rendering capabilities.  ViewText maintains a 2D vector of
+  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
+  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.
+  represent the X axis. The Y axis is represented by a vector of tasks.

-  The rendering process is complex.  It involves dynamically setting column
+  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.
@@ -144,24 +149,24 @@ Render

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

  It is intended that the test suite continues growing, mostly adding more
-  regression tests (bug.*.t) and more feature tests (feature.*.t).  The test are
-  mostly written in Perl, and utilize the Test::More module to generate TAP
-  output.  Some tests are written in C++ and also generate TAP.
+  regression and feature tests. The test are mostly written in Perl, and utilize
+  the Test::More module to generate TAP output. This is changing though, and the
+  suite is slowly migrating to Python. Some tests are written in C++ and all
+  tets generate TAP output.

-  There are currently around 5,000 unit tests, that take a minute or two to run
+  There are currently about 8,000 unit tests, that take a minute or two to run
  in total.

-  There is a tinderbox that runs on a variable frequency.  As a release
-  approaches, the frequency is boosted so there are always current results to be
-  found.  Between releases the tinderbox runs daily.  It is intended that this
-  be modified for continuous integration, so it runs once per commit.
+  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://tasktools.org/tinderbox/task.html
+    http://central.tasktools.org/

  When making code changes, it is important that the test suite be run to verify
  that functionality was not broken.
@@ -175,27 +180,31 @@ Debugging
      http://tasktools.org/performance).
    - Data load times.
    - Terminal size, color capabilities.
-    - Command line parsing steps, shown in colorful diagrams.
+    - 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',
+  '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
-  Redmine issue, or send them to support@taskwarrior.org.  A good patch:
+  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.
    - Precisely addresses one issue only.
    - Doesn't break unit tests.
    - Doesn't introduce dependencies.
-    - Is accompanied by unit tests, where appropriate.
+    - 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 any of the above reasons, 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.
+  A patch may be rejected for not following the above guidelines, 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.

 ---
--- a/50
+++ b/50
@@ -12,8 +12,8 @@ from source.

 More information on cmake can be obtained at http://cmake.org

-Optionally, you might want to have Lua installed, if you wish to write plugins
-and modify taskwarrior.
+It is HIGHLY RECOMMENDED that you build with a library that provides uuid_*
+functions, such as libuuid.


 Basic Installation
@@ -67,16 +67,34 @@ lists them and their defaults plus the CMAKE_INSTALL_PREFIX:
  CMAKE_INSTALL_PREFIX  /usr/local
  TASK_BINDIR           bin
  TASK_DOCDIR           share/doc/task
+  TASK_RCDIR            share/doc/task/rc
  TASK_MAN1DIR          share/man/man1
  TASK_MAN5DIR          share/man/man5

 The corresponding TASK_* variables will be combined with CMAKE_INSTALL_PREFIX to
-get absolute installation directoris:
+get absolute installation directories:

-  CMAKE_INSTALL_PREFIZ/TASK_BINDIR   /usr/local/bin
-  CMAKE_INSTALL_PREFIZ/TASK_DOCDIR   /usr/local/share/doc/task
-  CMAKE_INSTALL_PREFIZ/TASK_MAN1DIR  /usr/local/share/man/man1
-  CMAKE_INSTALL_PREFIZ/TASK_MAN5DIR  /usr/local/share/man/man5
+  CMAKE_INSTALL_PREFIX/TASK_BINDIR   /usr/local/bin
+  CMAKE_INSTALL_PREFIX/TASK_DOCDIR   /usr/local/share/doc/task
+  CMAKE_INSTALL_PREFIX/TASK_RCDIR    /usr/local/share/doc/task/rc
+  CMAKE_INSTALL_PREFIX/TASK_MAN1DIR  /usr/local/share/man/man1
+  CMAKE_INSTALL_PREFIX/TASK_MAN5DIR  /usr/local/share/man/man5
+
+
+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
+  fra_FRA 4
+  ita_ITA 5
+  por_PRT 6


 Uninstallation
@@ -112,11 +130,6 @@ Cygwin
  again, or reinstall Cygwin under your normal Windows login.


-Darwin
-  If you're having trouble with Lua, check to see if the include files were
-  installed. If you're using fink, this will require the lua51-dev package in
-  addition to lua51.
-
 Darwin, 32bit
  The taskwarrior packages will not work on a 32-bit OSX installation on Core
  Duo hardware.  You will need to build Taskwarrior from source, and use this
@@ -124,16 +137,17 @@ Darwin, 32bit

    cmake -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32 .

- See:  http://taskwarrior.org/issues/817
-       http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
-       http://stackoverflow.com/questions/2617508/cmake-gcc-cuda-and-m32-wtf
-       http://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt
+  See:
+    http://taskwarrior.org/issues/817
+    http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
+    http://stackoverflow.com/questions/2617508/cmake-gcc-cuda-and-m32-wtf
+    http://stackoverflow.com/questions/6077414/cmake-how-to-set-the-ldflags-in-cmakelists-txt


 Troubleshooting
 ---------------

-If you've recently made changes to dependencies (by reinstalling Lua, for
+If you've recently made changes to dependencies (by reinstalling them, for
 example) be sure to rerun 'cmake .' before trying to execute 'make' again.

 CMake will run and locate all the necessary pieces for the build, and create
@@ -142,7 +156,7 @@ may be compiler errors and warnings when running 'make'.  Sometimes you will run
 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' 
+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
 message in the support forums at taskwarrior.org along with the information.

--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 taskwarrior - a command line task list manager.

-Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+Copyright 2006 - 2015, 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
--- a/177
+++ b/177
@@ -1,118 +1,109 @@

-New Features in taskwarrior 2.0.0
+New Features in taskwarrior 2.4.0

-  - New 'ids' command that returns a filtered set of task ID numbers, instead
-    of the actual tasks.  Similarly, there is a 'uuids' command.
-  - Attribute modifiers may be prefixed with '~' to return the opposite of a
-    filter's results.
-  - Status attribute can now be used in report.
-  - Project names may now contain spaces.
-  - New export-html.pl script.
-  - Now supports the 'inverse' color attribute.
-  - Reports may now be sorted by columns that are not displayed (example: ID,
-    project, due date and description sorted by urgency).
-  - Performance enhancements.
-  - New 'next' report, that gauges urgency and reports the most urgent tasks.
-  - The 'next' report is now the default command.
-  - Fine control of verbosity through the 'verbose=' configuration variable.
-  - New 'execute' command that runs external scripts/programs.
-  - JSON is the new default export format.
-  - New 'reports' command that lists reports and their descriptions.
-  - New complex aliases.
-  - Filtering now available on most read-only commands.
-  - The done, delete, start and stop commands now allow modification to the
-    task and annotations.
-  - New 'columns' command to list the supported columns and formats.
-  - New 'eoq' and 'soq' dates to refer to the end and start of the quarter.
-  - Urgency now has an 'age' component.
+  - The 'show' command displays default configuration values, when appropriate.
+  - Removed deprecated commands 'push', 'pull' and 'merge'.
+  - Portuguese (por-PRT), French (fra-FRA), Esperanto (epo-RUS) and Polish
+    (pol-POL) localizations.
+  - Better handling for deletion of recurring tasks.
+  - New virtual tags: YESTERDAY, TOMORROW, READY, PENDING, COMPLETED, DELETED,
+    TAGGED.
+  - The '_get' command properly uses exit codes.
+  - Regular expressions are now enabled by default.
+  - The 'filter' verbosity token shows the complete filter used for the last
+    command.
+  - The 'new-uuid' verbosity token shows the UUID of newly created tasks.
+  - The 'info' report now breaks down urgency values.
+  - New 'color.until' color rule.
+  - Using a non-zero 'urgency.inherit.coefficient' value means a task inherits
+    the urgency values of the dependency chain.
+  - Listing breaks now supported.  See 'man taskrc'.
+  - New fish shell completion script.
+  - The filter form 'name:value' now maps to the partial match operator '=',
+    rather than the exact match operator, '=='.  This means that dates now
+    match on the day by default, not the time also.
+  - UDA indicator format.
+  - Hooks.
+  - New and updated holidays.rc files.

-  Please refer to the ChangeLog file for full details.  There are too many to
-  list here.
+New commands in taskwarrior 2.4.0

-New commands in taskwarrior 2.0.0
+  - New 'calc' command (and standalone utility) for quick command line
+    calculations.

-  - "ids" command that accepts filters, and returns an ID sequence.
+New configuration options in taskwarrior 2.4.0

-New configuration options in taskwarrior 2.0.0
+  - The 'taskd.trust' setting is now a tri-state, supporting values 'strict',
+    'ignore hostname' and 'allow all', for server certificate validation.
+  - New theme: dark-gray-blue-256.theme
+  - The 'allow.empty.filter' setting can be set to 'no' to disallow the
+    potentially dangerous combination of write commands and empty filters.
+  - New truncated_count column style for the description field which as the
+    name says is a combination of the existing truncated and count styles.
+  - New 'hooks' setting is a master control switch for hook processing.
+  - New 'debug.hooks' for debugging hook scripts.
+  - New 'debug.parser' for debugging parser issues scripts.
+  - New 'color.label.sort' is used to color the column label of sort columns.
+  - New 'urgency.uda.<name>.<value>' allows specific UDA values to affect
+    urgency.
+  - New 'recurrence.confirmation' which allows bypassing confirmation for
+    changes to recurring tasks, by accepting, rejecting or prompting.
+  - New 'uda.<name>.indicator' to override the UDA indicator.

-  - Now includes Belarus, Czech Republic and Japanese holiday data.  Please note
-    that the holiday file names now include a full locale.  For example:
-    'holidays.en-US.rc' instead of 'holidays-US.rc'.
-  - The old 'curses' configuration variable is renamed to 'detection', but
-    retains the original meaning, which is whether or not to auto-detect the
-    dimensions of the terminal window.
-  - Extension system now controlled by the 'extensions' configuration variable.
-  - Two new solarized color themes.
-  - New 'dependency.indicator' for the 'depends.indicator' report field format.
-  - New 'indent.annotation' for the description.default field format.
-  - New 'color.label' for report column labels.
-  - New 'verbose=...' support for individual verbosity settings.
-  - New 'avoidlastcolumn' support for Cygwin users.
-  - New 'patterns' enables/disables command line pattern support.
-  - New 'expressions' enables/disables command line expression support.
-  - New 'dom' enables/disables DOM support for the command line.
-  - New 'json.array' determines whether 'query' command output is enclosed by
-    '[...]'.
-  - New 'regex' control determines whether substitutions use Regular Expressions
-    or simple text patterns.
-  - New 'exit.on.missing.db' control causes an exit if the ~/.task directory
-    (or override) is missing.
-  - New 'color.completed' and 'color.deleted' color rules.
-  - New 'abbreviation.minimum' setting controls how short an abbreviated
-    command or value may be.
-  - New 'hyphenate' setting controls whether long lines are hyphenated when
-    broken during text-wrapping.
-  - New 'defaultheight' setting overrides the assumed 24 lines when 'detection'
-    is disabled.  This setting only affects charts.
-  - New 'urgency.age.coefficient' and 'urgency.age.max' settings control the new
-    age component to the urgency value.
+Newly deprecated features in taskwarrior 2.4.0

-Newly deprecated features in taskwarrior 2.0.0
+  - The alias '_query' is deprecated.
+  - Bare word search terms are deprecated, so 'task pattern list' will not
+    be supported in future releases, instead requiring 'task /pattern/ list'.
+  - The 'limit' pseudo attribute will change to 'rc.limit' in a future release.

-  - The 'next' configuration variable has been removed.
-  - Use of 'fg:' and 'bg:' attributes are deprecated.
-  - Use of 'echo.command' configuration variable.  Use verbosity token
-    'affected' instead.
-  - Use of 'edit.verbose' configuration variable.  Use verbosity token 'edit'
-    instead.
-  - Use of 'export.ical.class' configuration variable.  Value is now specified
-    in the scripts/add-ons/export-ical.pl script.
-  - Use of 'report.<name>.limit' configuration variable.  This is now handled
-    in the report filter as 'limit:<tasks>'.
-  - Use of 't', '+', 'enable' and 'enabled' in configuration values to mean
-    'on/yes/true'.
+Removed features in 2.4.0

---
+  - Version 1.x column names no longer supported.
+  - Version 1.x sort columns no longer supported.
+  - Old-style color names including underscores are no longer supported.
+  - Removed priority counts from the 'projects' commands.
+  - Removed the unused 'locale' configuration variable.
+  - Removed the unused 'patterns' confguration variable.
+  - Removed the obsolete 'task-faq.5' man page.
+  - Removed the obsolete 'task-tutorial.5' man page.
+  - Removed the obsolete 'tasksh.1' man page.
+  - Removed the 'tasksh' program from the Taskwarrior distribution. It is now
+    a separate project.
+  - Removed the 'complete.all.projects' setting that was not used.
+  - Removed support for 'report.X.limit', which can now be set in the report
+    filter 'limit:N'.
+  - The 'total active time' information is removed from the 'info' report.
+    This was being misinterpreted as support for time tracking.
+  - The 'shadow file' feature is removed, but replaced with an example hook
+    script that performs the same function..
+
+Known Issues
+
+  - On Cygwin, case-insensitive regex searches are broken. The default is
+    now case-sensitive for Cygwin only.
+  - https://bug.tasktools.org

 Taskwarrior has been built and tested on the following configurations:

-  * OS X 10.7 Lion, 10.6 Snow Leopard and 10.5 Leopard
-  * Fedora 14 Laughlin, 13 Goddard
-  * Ubuntu 10.10 Maverick Meerkat, 10.04 Lucid Lynx
-  * Debian Sid
-  * Slackware 12.2
-  * Arch Linux
-  * Gentoo Linux
-  * SliTaz Linux
-  * CRUX Linux
-  * SuSE 11.3
-  * Solaris 10 and 8
-  * OpenBSD 4.5
-  * FreeBSD
-  * NetBSD
-  * Cygwin 1.7 and 1.5
-  * Haiku R1/alpha1
+  * OS X 10.10 Yosemite, 10.9 Mavericks
+  * Fedora 20 Heisenbug
+  * Ubuntu 14.04 Trusty Tahr
+  * Debian 7.0 Wheezy (stable)
+  * Arch 2014.05
+  * FreeBSD 10
+  * Cygwin 1.7.29, 1.7.32

 ---

 While Taskwarrior has undergone testing, bugs are sure to remain.  If you
 encounter a bug, please enter a new issue at:

-  http://taskwarrior.org/projects/taskwarrior/issues/new
+  https://bug.tasktools.org

 Or you can also report the issue in the forums at:

-  http://taskwarrior.org/projects/taskwarrior/boards
+  https://answers.tasktools.org

 Or just send a message to:

--- a/26
+++ b/26
@@ -1,26 +0,0 @@
-
-Thank you for taking a look at taskwarrior!
-
-Taskwarrior is a GTD, todo list, task management, command line utility with a
-multitude of features.  It is a portable, well supported, very active project,
-and it is Open Source.  Taskwarrior has binary distributions, online
-documentation, demonstration movies, and you'll find all the details at:
-
-    http://taskwarrior.org
-
-At the site you'll find a wiki, discussion forums, downloads, news and more.
-
-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.
-
-Please send your support questions and code patches to:
-
-    support@taskwarrior.org
-
-Consider joining taskwarrior.org and participating in the future of taskwarrior.
-
---
-
-taskwarrior is released under the MIT license. For details check the LICENSE
-file.
--- a/README.md
+++ b/README.md
@@ -0,0 +1,47 @@
+# Disclaimer during ongoing development
+
+We want to discourage you from using the development version of Taskwarrior.
+
+The development branch is a work in progress and may not pass all quality tests,
+therefore it may harm your data. We do not guarantee proper or even adequate
+functionality, performance or timely fixes.
+
+We welcome bug reports from beta- and release-level software, but generally not
+development versions. If you are undaunted by this, please:
+
+- Make proper backups.
+- Expect broken and missing functionality.
+- Be aware that using the development branch involves risks.
+
+---
+
+Thank you for taking a look at Taskwarrior!
+
+Taskwarrior is a GTD, todo list, task management, command line utility with a
+multitude of features. It is a portable, well supported and very active Open
+Source project. Taskwarrior has binary distributions, online documentation,
+demonstration movies, and you'll find all the details at:
+
+    http://taskwarrior.org
+
+At the site you'll find online documentation, downloads, news and more.
+
+Your contributions are especially welcome. Whether it comes in the form of
+code patches, ideas, discussion, bug reports, encouragement or criticism, your
+input is needed.
+
+For support options, take a look at:
+
+    http://taskwarrior.org/support
+
+Please send your code patches to:
+
+    support@taskwarrior.org
+
+Consider joining bug.tasktools.org, answers.tasktools.org and participating in
+the future of taskwarrior.
+
+---
+
+Taskwarrior is released under the MIT license. For details check the LICENSE
+file.
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -1,6 +1,7 @@
 /* cmake.h.in. Creates cmake.h during a cmake run */

-#define L10N                                           // Localization complete.
+/* Product identification */
+#define PRODUCT_TASKWARRIOR 1

 /* Package information */
 #define PACKAGE           "${PACKAGE}"
@@ -11,17 +12,21 @@
 #define PACKAGE_VERSION   "${PACKAGE_VERSION}"
 #define PACKAGE_STRING    "${PACKAGE_STRING}"

+#define CMAKE_BUILD_TYPE  "${CMAKE_BUILD_TYPE}"
+
 /* Installation details */
-#define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_DOCDIR}/rc"
+#define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}"

 /* Localization */
-#define PACKAGE_LANGUAGE  1
-#define LANGUAGE_EN_US 1
-
-/*
-Override PACKAGE_LANGUAGE, then
-#define LANGUAGE_XX_YY 2
-*/
+#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}

 /* git information */
 #cmakedefine HAVE_COMMIT
@@ -36,31 +41,40 @@ Override PACKAGE_LANGUAGE, then
 #cmakedefine CYGWIN
 #cmakedefine FREEBSD
 #cmakedefine OPENBSD
+#cmakedefine NETBSD
 #cmakedefine HAIKU
 #cmakedefine SOLARIS
-#cmakedefine WIN32
+#cmakedefine KFREEBSD
+#cmakedefine GNUHURD
 #cmakedefine UNKNOWN

-/* Found the lua library */
-#cmakedefine HAVE_LIBLUA
+/* Found the GnuTLS library */
+#cmakedefine HAVE_LIBGNUTLS
+
+/* Found the Readline library */
+#cmakedefine HAVE_READLINE

 /* Found the pthread library */
 #cmakedefine HAVE_LIBPTHREAD

-/* Found the readline library */
-#cmakedefine HAVE_READLINE
-#cmakedefine HAVE_LIBREADLINE
+/* Found tm_gmtoff */
+#cmakedefine HAVE_TM_GMTOFF

-/* Found random */
-#cmakedefine HAVE_RANDOM
+/* Found timegm */
+#cmakedefine HAVE_TIMEGM

-/* Found srandom */
-#cmakedefine HAVE_SRANDOM
+/* Found st.st_birthtime struct member */
+#cmakedefine HAVE_ST_BIRTHTIME

-/* Found the uuid library */
-#cmakedefine HAVE_UUID
+/* Found get_current_dir_name */
+#cmakedefine HAVE_GET_CURRENT_DIR_NAME
+
+/* Found uuid_unparse_lower in the uuid library */
 #cmakedefine HAVE_UUID_UNPARSE_LOWER

+/* Found wordexp.h */
+#cmakedefine HAVE_WORDEXP
+
 /* Undefine this to eliminate the execute command */
 #define HAVE_EXECUTE 1

--- a/cmake/Modules/FindReadline.cmake
+++ b/cmake/Modules/FindReadline.cmake
@@ -0,0 +1,81 @@
+# - Find the readline library
+# This module defines
+#  READLINE_INCLUDE_DIR, path to readline/readline.h, etc.
+#  READLINE_LIBRARIES, the libraries required to use READLINE.
+#  READLINE_FOUND, If false, do not try to use READLINE.
+# also defined, but not for general use are
+# READLINE_readline_LIBRARY, where to find the READLINE library.
+# READLINE_ncurses_LIBRARY, where to find the ncurses library [might not be defined]
+
+# Apple readline does not support readline hooks
+# So we look for another one by default
+IF (APPLE OR FREEBSD)
+  FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS
+    /usr/include/
+    /sw/include
+    /opt/local/include
+    /opt/include
+    /usr/local/include
+    NO_DEFAULT_PATH
+    )
+ENDIF (APPLE OR FREEBSD)
+FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h)
+
+
+# Apple readline does not support readline hooks
+# So we look for another one by default
+IF (APPLE OR FREEBSD)
+  FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline PATHS
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/lib
+    /usr/local/lib
+    NO_DEFAULT_PATH
+    )
+ENDIF (APPLE OR FREEBSD)
+FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline)
+
+# Sometimes readline really needs ncurses
+IF (APPLE OR FREEBSD)
+  FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses PATHS
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/lib
+    /usr/local/lib
+    /usr/lib
+    NO_DEFAULT_PATH
+    )
+ENDIF (APPLE OR FREEBSD)
+FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses)
+
+MARK_AS_ADVANCED (
+  READLINE_INCLUDE_DIR
+  READLINE_readline_LIBRARY
+  READLINE_ncurses_LIBRARY
+  )
+
+SET (READLINE_FOUND "NO" )
+IF (READLINE_INCLUDE_DIR)
+  IF (READLINE_readline_LIBRARY)
+    SET (READLINE_FOUND "YES" )
+    SET (READLINE_LIBRARIES
+      ${READLINE_readline_LIBRARY} 
+      )
+
+    # some readline libraries depend on ncurses
+    IF (READLINE_ncurses_LIBRARY)
+      SET (READLINE_LIBRARIES ${READLINE_LIBRARIES} ${READLINE_ncurses_LIBRARY})
+    ENDIF (READLINE_ncurses_LIBRARY)
+
+  ENDIF (READLINE_readline_LIBRARY)
+ENDIF (READLINE_INCLUDE_DIR)
+
+IF (READLINE_FOUND)
+  MESSAGE (STATUS "Found readline library")
+ELSE (READLINE_FOUND)
+  IF (READLINE_FIND_REQUIRED)
+    MESSAGE (FATAL_ERROR "Could not find readline -- please give some paths to CMake")
+  ENDIF (READLINE_FIND_REQUIRED)
+ENDIF (READLINE_FOUND)
--- a/commit.h.in
+++ b/commit.h.in
@@ -1,5 +1,4 @@
 /* commit.h.in. Creates commit.h during a cmake run */
-#define L10N                                           // Localization complete.

 /* git information */
 #define COMMIT "${COMMIT}"
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,16 +1,16 @@
 cmake_minimum_required (VERSION 2.8)
 message ("-- Configuring man pages")
-set (man_FILES task-color.5 task-faq.5 task-sync.5 task-tutorial.5 task.1 taskrc.5)
+set (man_FILES task-color.5 task-sync.5 taskrc.5 task.1)
 foreach (man_FILE ${man_FILES})
  configure_file (
    man/${man_FILE}.in
    man/${man_FILE})
 endforeach (man_FILE)

-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/   DESTINATION ${TASK_MAN1DIR}
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/   DESTINATION ${TASK_MAN1DIR}
                                                      FILES_MATCHING PATTERN "*.1")
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/   DESTINATION ${TASK_MAN5DIR}
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/   DESTINATION ${TASK_MAN5DIR}
                                                      FILES_MATCHING PATTERN "*.5")
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc     DESTINATION ${TASK_DOCDIR})
+install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc/    DESTINATION ${TASK_RCDIR})

 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ref/task-ref.pdf DESTINATION ${TASK_DOCDIR})
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -1,6 +1,4 @@
 task-color.5
-task-faq.5
 task-sync.5
-task-tutorial.5
 task.1
 taskrc.5
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -1,4 +1,4 @@
-.TH task-color 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
+.TH task-color 5 2015-01-01 "${PACKAGE_STRING}" "User Manuals"

 .SH NAME
 task-color \- A color tutorial for the taskwarrior command line todo manager.
@@ -243,12 +243,12 @@ be a visual mess.  Beware!
 The precedence for the color rules is determined by the configuration
 variable 'rule.precedence.color', which by default contains:

-    due.today,active,blocked,overdue,due,keyword,project,tag,recurring,pri,tagged,completed,deleted
+    due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted

 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.

-The keyword rule shown here as 'keyword' corresponds to a wildcard pattern,
+The keyword rule shown here as 'keyword.' corresponds to a wildcard pattern,
 meaning 'color.keyword.*', or in other words all the keyword rules.  Similarly
 for the 'color.tag.*' and 'color.project.*' rules.

@@ -265,7 +265,7 @@ your .taskrc file (note that your installation may use a slightly different path
 from the example):

 .RS
-include /usr/local/share/doc/task/rc/dark-256.theme
+include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-256.theme
 .RE

 You can use any of the standard taskwarrior themes:
@@ -294,8 +294,17 @@ light-256.theme
 solarized-dark-256.theme
 .br
 solarized-light-256.theme
+.br
+dark-default-16.theme
+.br
+dark-gray-blue-256.theme
+.br
+no-color.theme
 .RE

+Bear in mind that if you are using a terminal with a dark background, you will
+see better results using a dark theme.
+
 You can also see how the theme will color the various tasks with the command:

    $ task color legend
@@ -304,7 +313,7 @@ Better yet, create your own, and share it.  We will gladly host the theme file
 on <http://taskwarrior.org>.

 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2015 P. Beckingham, F. Hernandez.

 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
@@ -312,8 +321,6 @@ http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
-.BR task-faq(5),
-.BR task-tutorial(5),
 .BR task-sync(5)

 For more information regarding taskwarrior, the following may be referenced:
@@ -324,7 +331,7 @@ The official site at

 .TP
 The official code repository at
-<git://tasktools.org/task.git/>
+<https://git.tasktools.org/scm/tm/task.git>

 .TP
 You can contact the project by writing an email to
--- a/doc/man/task-faq.5.in
+++ b/doc/man/task-faq.5.in
@@ -1,380 +0,0 @@
-.TH task-faq 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
-
-.SH NAME
-task-faq \- A FAQ for the task(1) command line todo manager.
-
-.SH WELCOME
-Welcome to the taskwarrior FAQ.  If you have would like to see a question answered
-here, please send us a note at <support@taskwarrior.org>.
-
-.TP
-.B Q: When I redirect the output to a file, I lose all the colors.  How do I fix this?
-Taskwarrior knows when the output is not going directly to a terminal, and
-strips out all the color control characters.  This is based on the assumption
-that the color control codes are not wanted in the file.  Prevent this with the
-following entry in your .taskrc file:
-
-    _forcecolor=on
-
-or by temporarily overriding the value on the command line:
-
-    task ... rc._forcecolor=on
-
-There is an additional problem using pagers such as 'less' and 'more', because
-color control codes are stripped.  When using less, these options will preserve
-the color codes:
-
-    task ... | less -FrX
-
-There have been problems reported with the Linux 'more' pager, which inserts
-newline characters.
-
-.TP
-.B Q: How do I backup my taskwarrior data files?  Where are they?
-Taskwarrior writes all data to files in this location:
-
-    ~/.task/
-
-You may have overridden this location with the 'data.location' configuration
-setting, in which case backup that instead.  All files in this location should
-be backed up.  Making sure all the files in this location are backed up, and not
-just a named subset will ensure that you properly backup future versions of
-taskwarrior, which will likely introduce more files in this location.
-
-Don't forget there is also the ~/.taskrc file that contains your taskwarrior
-configuration data.
-
-.TP
-.B Q: How can I separate my work tasks from my home tasks? Specifically, can I keep them completely separate?
-You can do this by creating an alternate .taskrc file, then using shell
-aliases. Here are example Bash commands to achieve this:
-
-    % cp ~/.taskrc ~/.taskrc_home
-    % (now edit .taskrc_home to change the value of data.location)
-    % alias wtask="task"
-    % alias htask="task rc:~/.taskrc_home"
-
-This gives you two commands, 'wtask' and 'htask' that operate using two
-different sets of task data files.  Bash shell functions are a good alternative.
-
-.TP
-.B Q: Can I revert to a previous version of taskwarrior? How?
-Yes, you can revert to a previous version of task, simply by downloading an
-older version and installing it. If you find a bug in task, then this may be the
-only way to work around the bug, until a patch release is made.
-
-Note that it is possible that the taskwarrior file format will change. For
-example, the format changed between versions 1.5.0 and 1.6.0. Taskwarrior will
-automatically upgrade the file but if you need to revert to a previous version
-of taskwarrior, there is the file format to consider. This is yet another good
-reason to back up your task data files!
-
-.TP
-.B Q: Can I have two separate versions of taskwarrior installed?  How?
-Yes, and here is one simple way to do that.  Install the older version of
-taskwarrior, and then rename the 'task' binary to something like 't194' to
-reflect the version number.  Then install the newer version, which will be
-named 'task'.  Now you have 't194' and 'task' both installed, both using the
-same configuration and data.
-
-Note that the older version will not be aware of any new configuration settings
-and so will complain about them in the 'show' command.  This can be ignored.
-Likewise the newer version may complain about obsolete entries in the
-configuration.
-
-Note also that the man pages will overwrite, which is why it is suggested that
-the older version be installed first, so that you benefit from improved
-documentation.
-
-.TP
-.B Q: How do I build a Darwin 32bit version of task
-The taskwarrior packages will not work on a 32-bit OSX installation on Core
-Duo hardware.  You will need to build Taskwarrior from source, and use this
-configure command:
-
-      ./configure "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32"
-
-See:  http://taskwarrior.org/issues/817
-      http://stackoverflow.com/questions/3261909/build-32bit-on-64-bit-linux-using-a-configure-script
-
-.TP
-.B Q: How do I build taskwarrior under Cygwin?
-Take a look at the README.build file, where the latest information on build
-issues is kept.  Taskwarrior is built the same way everywhere. But under Cygwin,
-you'll need to make sure you have the following packages available first:
-
-    gcc
-    make
-
-The gcc and make packages allow you to compile the code, and are therefore
-required.
-
-.TP
-.B Q: Do colors work under Cygwin?
-They do, but only in a limited way. You can use regular foreground colors
-(black, red, green ...) and you can regular background colors (on_black, on_red,
-on_green ...), but underline and bold are not supported.
-
-If you run the command:
-
-    % task colors
-
-Taskwarrior will display all the colors it can use, and you will see which ones
-you can use.
-
-Note that if you install the 'mintty' shell in Cygwin, then you can use 256
-colors.
-
-See the 'man task-color' page for more details on which colors can be used.
-
-.TP
-.B Q: Where does taskwarrior store the data?
-By default, taskwarrior creates a .taskrc file in your home directory and
-populates it with defaults.  Taskwarrior also creates a .task directory in your
-home directory and puts data files there.
-
-.TP
-.B Q: Can I edit that data?
-Of course you can.  It is a simple text file, and looks somewhat like the JSON
-format, and if you are careful not to break the format, there is no reason not
-to edit it.  But taskwarrior provides a rich command set to do that manipulation
-for you, so it is probably best to leave those files alone.
-
-.TP
-.B Q: How do I restore my .taskrc file to defaults?
-If you delete (or rename) your .taskrc file, taskwarrior will offer to create a
-default one for you.  Another way to do this is with the command:
-
-    task rc:new-file version
-
-Taskwarrior will create 'new-file' if it doesn't already exist.  There will not
-be much in it though - taskwarrior relies heavily on default values, which can
-be seen with this command:
-
-    task show
-
-This lists all the currently known settings.  If you have just created a
-new file, then this command lists only the defaults.
-
-Note that this is a good way to learn about new configuration settings,
-particularly if your .taskrc file was created by an older version.
-
-.TP
-.B Q: Do I need to back up my taskwarrior data?
-Yes you do, like all your other files.  You should back up all the files in your
-~/.task directory, and your ~/.taskrc file too.
-
-.TP
-.B Q: Can I share my tasks between different machines?
-Yes, you can.  Most people have success with a DropBox - a free and secure file
-synching tool.  Simply configure taskwarrior to store it's data in a dropbox
-folder, by modifying the:
-
-    data.location=...
-
-configuration variable.  Check out DropBox at http://www.dropbox.com.
-
-.TP
-.B Q: I don't want to use dropbox. Is there another way to synchronize my tasks?
-Of course. Especially if you want to modify tasks offline on both machines and
-synchronize them later on. For this purpose there is a 'merge' command which is
-is able to insert the modifications you made to one of your task databases into
-a second database.
-
-Here is a basic example of the procedure:
-
-    task merge ssh://user@myremotehost/.task/
-    task push ssh://user@myremotehost/.task/
-
-The first command fetches the undo.data file from the remote system, reads the
-changes made and updates the local database. When this merge command completes,
-you should copy all the local .data files to the remote system either by using
-the push command explicitly or by activating the merge.autopush feature in the 
-~/.taskrc file. This way you ensure that both systems are fully synchronized.
-
-.TP
-.B Q: The undo.data file gets very large - do I need it?
-You need it if you want the undo capability, or the merge capability mentioned
-above.  But if it gets large, you can certainly truncate it to save space, just
-be careful to delete lines from the top of the file, up to and including a
-separator '---'.  The simplest way is to simply delete the undo.data file.  Note
-that it does not slow down taskwarrior, because it is never read until you want
-to undo.  Otherwise taskwarrior only appends to the file.
-
-It is not recommended that you delete the undo.data file.
-
-.TP
-.B Q: How do I know whether my terminal support 256 colors?
-You will need to make sure your TERM environment variable is set to xterm-color,
-otherwise the easiest way is to just try it!  With version 1.9 or later, you
-simply run
-
-    task color
-
-and a full color palette is displayed.  If you see only 8 or 16 colors, perhaps
-with those colors repeated, then your terminal does not support 256 colors.
-
-See the task-color(5) man page for more details.
-
-.TP
-.B Q: How do I make use of all these colors?
-Use one of our provided color themes, or create your own - after all, they are
-just collections of color settings.
-
-See the task-color(5) man page for an in-depth explanation of the color rules.
-
-.TP
-.B Q: How can I make taskwarrior put the command in the terminal window title?
-Just set the following value in your .taskrc file:
-
-    xterm.title=on
-
-.TP
-.B Q: Taskwarrior searches in a case-sensitive fashion - can I change that?
-You can.  Just set the following value in your .taskrc file:
-
-    search.case.sensitive=no
-
-This will affect searching for keywords:
-
-    task Document list
-
-taskwarrior will perform a caseless search in the description and any
-annotations for the keyword 'Document'.  It also affects description and
-annotation substitutions:
-
-    task 1 modify /teh/the/
-
-The pattern on the left will now be a caseless search term.
-
-.TP
-.B Q: Why do the ID numbers change?
-Taskwarrior does this to always show you the smallest numbers it can.  The idea
-is that if your tasks are numbered 1 - 33, for example, those are easy to type
-in.  If instead task kept a rolling sequence number, after a while your tasks
-might be numbered 481 - 513, which makes it more likely to enter one
-incorrectly, because there are more digits.
-
-When you run a report (such as "list"), the numbers are assigned before display.
-For example, you can do this:
-
-    task list
-    task 12 done
-    task add Pay the rent
-    task 31 delete
-
-Those id numbers are then good until the next report is run.  This is because
-taskwarrior performs a garbage-collect operation on the pending tasks file when
-a report is run, which moves the deleted and completed tasks from the
-pending.data file to the completed.data file.  This keeps the pending tasks file
-small, and therefore keeps taskwarrior fast.  The completed data file is the one
-that grows unbounded with use, but that one isn't accessed as much, so it
-doesn't matter as much.  So in all, the ID number resequencing is about
-efficiency.
-
-.TP
-.B Q: How do I list tasks that are either priority 'H' or 'M', but not 'L'?
-Taskwarrior's filters are all by default combined with and implicit logical AND
-operator, so if you were to try this:
-
-    task priority:H priority:M list
-
-There would be no results, because the priority could not simultaneously be 'H'
-AND 'M'.  Instead, you have a choice.  You can do this:
-
-    task '(priority:H or priority:M)' list
-
-Note that the quotes are one way of escaping the ( ) characters that are
-otherwise interpreted by the shell before taskwarrior sees them.  You can also
-do this:
-
-    task priority.not:L priority.any: list
-
-This filter states that the priority must not be 'L', AND there must be a
-priority assigned.  This filter then properly lists tasks that are 'H' or 'M',
-because the two logical restrictions are not mutually exclusive as in the
-original filter.
-
-Some of you may be familiar with DeMorgan's laws of formal logic that relate
-the AND and OR operators in terms of each other via negation, which can be used
-to construct task filters.
-
-.TP
-.B Q: How do I delete an annotation?
-Taskwarrior now has a 'denotate' command to remove annotations.  Here is an
-example:
-
-    task add Original task
-    task 1 annotate foo
-    task 1 annotate bar
-    task 1 annotate foo bar
-
-Now to delete the first annotation, use:
-
-    task 1 denotate foo
-
-This takes the fragment 'foo' and compares it to each of the annotations. In
-this example, it will remove the first annotation, not the third, because it is
-an exact match.  If there are no exact matches, it will remove the first
-non-exact match:
-
-    task 1 denotate ar
-
-This will remove the second annotation - the first non-exact match.
-
-.TP
-.B Q: Why Lua as an extension language?
-Lua has many positive attributes:
-
- - Lua is written using tight, fast, standard C
- - Lua is a breeze to integrate into any product
- - The Lua source code is beautifully written
- - Lua is a small language
-
-Guile, Scheme and Neko were also considered.
-
-.TP
-.B Q: How can I help?
-There are lots of ways.  Here are some:
-
- - Provide feedback on what works, what does not
- - Tell us how task does or does not fit your workflow
- - Tell people about task
- - Report bugs when you see them
- - Contribute to our Wiki
- - Suggest features
- - Write unit tests
- - Write add-on scripts, and share them
- - Fix bugs
-
-.SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
-
-Taskwarrior is distributed under the MIT license. See
-http://www.opensource.org/licenses/mit-license.php for more information.
-
-.SH SEE ALSO
-.BR task(1),
-.BR taskrc(5),
-.BR task-tutorial(5),
-.BR task-color(5),
-.BR task-sync(5)
-
-For more information regarding task, the following may be referenced:
-
-.TP
-The official site at
-<http://taskwarrior.org>
-
-.TP
-The official code repository at
-<git://tasktools.org/task.git/>
-
-.TP
-You can contact the project by writing an email to
-<support@taskwarrior.org>
-
-.SH REPORTING BUGS
-.TP
-Bugs in taskwarrior may be reported to the issue-tracker at
-<http://taskwarrior.org>
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -1,361 +1,148 @@
-.TH task-sync 5 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
+.TH task-sync 5 2015-01-01 "${PACKAGE_STRING}" "User Manuals"

 .SH NAME
-task-sync \- A tutorial for the task(1) data synchronization capabilities.
+task-sync \- A discussion and tutorial for the various task(1) data
+synchronization capabilities.

-.SH DESCRIPTION
-Taskwarrior has built-in support for synchronization, which can be used to keep
-two task databases up to date, regardless of which one is used.  This capability
-can also be used to keep a backup copy of your task database on another machine.
+.SH INTRODUCTION
+Taskwarrior has several sync options, external and internal.  If you wish to
+sync your data, choose one method only; mixing methods is only going to lead to
+problems.  Each of the methods discussed have their own strengths.

-Taskwarrior can use various protocols for transferring the data.
-
-.SH HOW IT WORKS
-If you were to manually attempt to keep two separate task databases up to date,
-you would need to inspect both databases, and detect changes that occurred in
-each one.  Those changes would need to be migrated to the other database, while
-being careful not to miss a change, and not to confuse an 'add' in one with
-a 'delete' in the other.
-
-The synchronization feature does just this.  It can transfer task databases,
-compare tasks, and apply changes where necessary.
-
-.SH NEW COMMANDS
-Taskwarrior has 'pull', 'push' and 'merge' commands which perform the steps
-necessary to move files around and combine them.  In the common use case, you
-would only need to use the 'merge' command.  These commands take an argument
-that is a URI, which indicates where the remote database resides.
-
-To be clear, the local database always refers to your ~/.task directory (unless
-overridden), and the remote database is always specified by URI.
-
-.SH MERGE
-The merge command will fetch task data via URI and combine it with the local
-task database.  The syntax is:
+.SH ALTERNATIVES
+There are three alternatives for syncing data, which are:

+1) Version control systems, such as git, hg, svn
 .br
-.RS
-task merge [<URI>]
-.RE
-
-The URI is optional if the
-.B merge.default.uri
-configuration variable is set.  The URI may point to a different directory, or
-it may be a different computer.  Here is an example of the merge command:
-
+2) File hosting systems, such as DropBox
 .br
-.RS
-$ task merge ~/work/
-.RE
+3) Using the Taskserver and the 'sync' command

-This URI (~/work/) is a path name, which means the remote database is on the
-same computer.  Taskwarrior will fetch the data from the URI, and merge it with
-your local data in ~/.task.

-When complete, you will be asked whether you would like to push the combined
-data back to the remote location specified by the URI.  This is useful if you
-are keeping two task databases synchronized, but it can be turned off.  See
-CONFIGURATION.
+.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.

-Note that a merge operation is not atomically reversible.  You could however
-run the 'task undo' command repeatedly to undo the effects.
-
-.SH PUSH
-The push command will copy the local task database to the specified URI.  The
-syntax is:
+Setup is straightforward.  You place your .task directory under revision
+control.  You then need to perform a regular commit/push/pull/update to make
+sure that the data is propagated when needed.  You can even do this using shell
+scripts so that every task command is preceded by a 'pull' and followed by
+a 'push'.

+Strengths:
 .br
-.RS
-task push [<URI>]
-.RE
-
-The URI is optional if the
-.B push.default.uri
-configuration variable is set.  This command is useful for making backup copies
-of your task database.
-
-Note that the task files at the location specified by the URI are simply
-overwritten, so don't expect any merging to occur.  Misused, push can be
-dangerous.
-
-.SH PULL
-The pull command will copy a task database from a URI to the local task database
-(~/.task by default).  The syntax is:
-
+  - Good data transport mechanisms
 .br
-.RS
-task pull [<URI>]
-.RE
-
-The URI is optional if the
-.B pull.default.uri
-configuration variable is set.  This command is useful for restoring a backup
-copy of your task database.
-
-Note that your local task database files will be simply overwritten by the files
-obtained from the location specified by the URI, so don't expect any merging to
-occur.  Misused, pull can be dangerous.
-
-.SH URI TYPES
-The most basic URI is a path name on the local machine.  An example would be:
+  - Secure transport options

+Weaknesses:
 .br
-.RS
-/home/bob/.task/
-.RE
-
-All the other URIs allow access to remote machines.  The first uses SSH and scp
-(either form can be used):
-
+  - You need proficiency with VCS tools
 .br
-.RS
-ssh://[user@]host[:port]/absolute/path/to/.task/
+  - You will need to manually resolve conflicts frequently
 .br
-[user@]host:/absolute/path/to/.task/
-.RE
+  - You need to provide the mechanism for making sure copies are up to date

-In both cases paths are considered to be absolute. You can specify paths relative to the
-users home directory as follows:

+.SH OPTION 2: FILE HOSTING SERVICES
+There are many file hosting services, such as DropBox, Amazon S3, Google Drive,
+SkyDrive and more.  This technique involves storing your .task directory in a
+shared directory under the control of the file hosting services.
+
+Syncing happens quickly, although it is possible to run into conflict situations
+when there is no network connectivity, and the tasks are modified in two
+separate locations.  This is because the file hosting service knows only about
+files, and it has no idea how to merge tasks.  Avoid this problem by never
+modifying the same task on two machines, without an intervening sync.
+
+Setup simply involves creating the directory and modifying your data.location
+configuration variable like this:
+
+    $ task config data.location /path/to/shared/directory
+
+Strengths:
 .br
-.RS
-ssh://[user@]host[:port]/.task/
+  - Always secure
 .br
-[user@]host:.task/
-.RE
-
-or even shorter
-
+  - Good client support
 .br
-.RS
-[user@]host:.task/
-.RE
-
-Remark: Since taskwarrior simply calls the scp binary you can specify very much anything
-that scp would accept, e.g. host configurations from ~/.ssh/config or ~username
-expansion:
-
+  - Easy setup
 .br
-.RS
-ssh://configured-host/~[username]/.task/
+  - Transparent use
+
+Weaknesses:
 .br
-configured-host:~[username]/.task/
-.RE
+  - Tasks are not properly merged


-Rsync is another supported protocol that minimizes network traffic, by a clever
-algorithm that doesn't copy files that have not changed:
+.SH OPTION 3: TASKSERVER
+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.

+There is a 'sync' command built in to Taskwarrior, and with a server account
+and client configuration, syncing is 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)
+
+Once you have an account, you'll receive a certificate, key and a password.
+You'll need to put the certificate and key somewhere like this:
+
+    $ cp <name>.cert.pem ~/.task
+    $ cp <name>.key.pem ~/.task
+
+Then you configure Taskwarrior, using the account details:
+
+    $ task config taskd.certificate ~/.task/<name>.cert.pem
+    $ task config taskd.key         ~/.task/<name>.key.pem
+    $ task config taskd.credentials <organization>/<name>/<password>
+    $ task config taskd.server      <server domain>:<port>
+
+If you are using a private server, you are likely also using a self-signed
+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       yes
+
+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
+
+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
+go about your business, and when you want to sync, run this:
+
+    $ task sync
+
+You'll see a summary of how many tasks were uploaded and downloaded.  You can
+safely run the command as often as you like.  When there are no changes to sync,
+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.
+
+Strengths:
 .br
-.RS
-rsync://[user@]host.xz[:port]/path/to/.task/
-.RE
-
-Curl supports several protocols that can transfer data using HTTP, HTTPS and
-FTP:
-
+  - Always secure
 .br
-.RS
-http://host[:port]/path/to/.task/
+  - Minimal bandwidth
 .br
-https://host[:port]/path/to/.task/
+  - Tolerates connectivity outage
+
+Weaknesses:
 .br
-ftp://[user@]host[:port]/path/to/.task/
-.RE
-
-You can use single quotes to encapsulate user names that contain delimiting
-characters like '@', '/' or ':', e.g.:
-
-.br
-.RS
-ssh://'user@name'@host/
-.RE
-
-Remember to escape the quotes on your shell:
-
-.br
-.RS
-$ task push ftp://\'user@name\':host/
-.RE
-
-.SH CONFLICTS
-When modifications on the local and remote machine conflict, for example if
-both machines change the project name of the same task to different values,
-then Taskwarrior automatically selects the most recent change.  Thus, there
-are no conflicts.
-
-.SH EXAMPLE - Backup on another machine
-One very good use of 'push' is to make backup copies of your task database in
-another location.  Suppose your task database is kept in the usual place, in
-the ~/.task directory, and you wanted to make a backup copy in ~/backup.  You
-would use this command:
-
-.br
-.RS
-$ task push ~/backup/
-.RE
-
-This would copy the files in ~/.task to ~/backup, overwriting the files that
-were already in ~/backup.  To backup your files to another machine, you could
-use:
-
-.br
-.RS
-$ task push user@host:backup
-.RE
-
-This could be improved by setting the
-.B push.default.uri
-configuration variable and then relying on the default, like this:
-
-.br
-.RS
-$ task config push.default.uri user@host:backup
-.RE
-
-and then you need only run the push command:
-
-.br
-.RS
-$ task push
-.RE
-
-and the default push URI will be used.  If you wanted to restore a backup, you
-simply use the pull command instead:
-
-.br
-.RS
-$ task pull user@host:backup
-.RE
-
-This can be simplified by setting the
-.B pull.default.uri
-configuration variable and then relying on the default, like this:
-
-.br
-.RS
-$ task config pull.default.uri user@host:backup
-.RE
-
-Note that pull and push will blindly overwrite the task files without any
-merging.  Be careful.
-
-.SH EXAMPLE - Keeping two task databases synchronized
-The most common synchronization will be to keep two task databases synchronized
-on different machines.  Here is a full example, including setup that illustrates
-this.
-
-Suppose there are two machines, named 'local' and 'remote', for simplicity.
-Taskwarrior is installed on both machines.  The different machines are
-indicated here by the prompt.  Suppose Alice enters two tasks on her local
-machine:
-
-.br
-.RS
-local> task add Deliver the new budget proposal due:tuesday
-.br
-local> task add Set up a meeting with Bob
-.RE
-
-Then later adds a task on the remote machine:
-
-.br
-.RS
-remote> task add Present the budget proposal at the big meeting due:thursday
-.RE
-
-Now on the local machine, Alice merges the two task databases:
-
-.br
-.RS
-local> task merge alice@remote:.task
-.br
-Would you like to push the changes to 'alice@remote:.task'?  Y
-.RE
-
-Taskwarrior has combined the two task databases on local, then pushed the
-changes back to remote.  Now suppose Alice changes the due date for task 1
-on remote:
-
-.br
-.RS
-remote> task 1 due:wednesday
-.RE
-
-Now on the local machine, Alice sets up a default URI and autopush:
-
-.br
-.RS
-local> task config merge.default.uri alice@remote:.task
-.br
-local> task config merge.autopush yes
-.RE
-
-Now Alice can simply run merge to make sure that the new due date is copied to
-the local machine:
-
-.br
-.RS
-local> task merge
-.RE
-
-This time the URI is determined automatically, and after the merge the files are
-pushed back to the remote machine.  In a similar way, the remote machine can
-also be configured to merge from the local machine and push back to it.  Then it
-is just a matter of Alice remembering to merge now and then, from either
-machine, to have her data in two (or even more) places.
-
-.SH CONFIGURATION
-By setting these configuration variables, it is possible to simplify the
-synchronization commands, by relying on the defaults or alias names.
-
-.br
-.B merge.autopush=yes|no|ask
-.RS
-This controls whether the automatic push after a merge is performed, not
-performed, or whether the user is asked every time.  The default value is 'ask'.
-.RE
-
-.br
-.B merge.default.uri=<uri>
-.RS
-Sets a default URI so that just the 'task merge' command be run without the
-need to retype the URI every time. You can also use this configuration scheme
-to set alias names, e.g. set merge.desktop.uri and run 'task merge desktop'.
-.RE
-
-.br
-.B push.default.uri=<uri>
-.RS
-Sets a default URI so that just the 'task push' command be run without the
-need to retype the URI every time. You can also use this configuration scheme
-to set alias names, e.g. set push.desktop.uri and run 'task push desktop'.
-.RE
-
-.br
-.B pull.default.uri=<uri>
-.RS
-Sets a default URI so that just the 'task pull' command be run without the
-need to retype the URI every time. You can also use this configuration scheme
-to set alias names, e.g. set pull.desktop.uri and run 'task pull desktop'.
-.RE
-
-Note that, when using SSH/scp, hostnames will be expanded due to the ssh 
-configuration file ~/.ssh/config.
-
-.SH EXTERNAL DEPENDENCIES
-Depending on the URI protocols used, the utilities 'scp', 'rsync' and 'curl'
-must be installed and accessible via the $PATH environment variable.
-
-If you have deleted your ~/.task/undo.data file to save space, you will be
-unable to merge.  The change transactions stored in the undo.data file are
-used for synchronization.
+  - You need to manage your own server, or gain access to a hosted server.

 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
-
-The sync capabilities were written by J. Schlatow.
-Parts copyright (C) 2010 - 2012 J. Schlatow.
+Copyright (C) 2006 \- 2015 P. Beckingham, F. Hernandez.

 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
@@ -363,10 +150,7 @@ http://www.opensource.org/licenses/mit-license.php for more information.
 .SH SEE ALSO
 .BR task(1),
 .BR taskrc(5),
-.BR task-faq(5),
 .BR task-color(5),
-.BR task-tutorial(5),
-.BR ssh_config(5)

 For more information regarding task, the following may be referenced:

@@ -376,7 +160,7 @@ The official site at

 .TP
 The official code repository at
-<git://tasktools.org/task.git/>
+<https://git.tasktools.org/scm/tm/task.git>

 .TP
 You can contact the project by writing an email to
--- a/doc/man/task-tutorial.5.in
+++ b/doc/man/task-tutorial.5.in
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1,4 +1,4 @@
-.TH task 1 2012-03-17 "${PACKAGE_STRING}" "User Manuals"
+.TH task 1 2015-01-01 "${PACKAGE_STRING}" "User Manuals"

 .SH NAME
 task \- A command line todo manager.
@@ -18,17 +18,15 @@ At the core, taskwarrior is a list processing program. You add text and
 additional related parameters and redisplay the information in a nice way.  It
 turns into a todo list program when you add due dates and recurrence. It turns
 into an organized todo list program when you add priorities, tags (one word
-descriptors), project groups, etc.  Taskwarrior turns into an organized to do
-list program when you modify the configuration file to have the output displayed
-the way you want to see it.
+descriptors), project groups, etc.

 .SH FILTER
 The <filter> consists of zero or more search criteria that select tasks.  For
-example, to list all tasks belonging to the 'Home' project:
+example, to list all pending tasks belonging to the 'Home' project:

  task project:Home list

-You can specify multiple filter terms, each of which further restrict the
+You can specify multiple filter terms, each of which further restricts the
 result:

  task project:Home +weekend garden list
@@ -41,7 +39,7 @@ In this example, 'garden' is translated internally to:

 as a convenient shortcut.  The 'contains' here is an attribute modifier, which
 is used to exert more control over the filter than simply absence or presence.
-See 'ATTRIBUTE MODIFIERS' for a complete list of modifiers.
+See the section 'ATTRIBUTE MODIFIERS' below for a complete list of modifiers.

 Note that a filter may have zero terms, which means that all tasks apply to the
 command.  This can be dangerous, and this special case is confirmed, and
@@ -69,7 +67,8 @@ The parentheses isolate the logical term from any default command filter or
 implicit report filter which would be combined with an implicit 'and'.

 A filter may target specific tasks using ID or UUID numbers.  To specify
-multiple tasks use one of these forms:
+multiple tasks use one of these forms (comma or space-separated list of ID
+numbers, UUID numbers or ID ranges):

  task 1,2,3                                    delete
  task 1-3                                      info
@@ -84,7 +83,8 @@ as:
  task <filter> <command> project:Home
  task <filter> <command> +weekend +garden due:tomorrow
  task <filter> <command> Description/annotation text
-  task <filter> <command> /from/to/
+  task <filter> <command> /from/to/     <- replace first match
+  task <filter> <command> /from/to/g    <- replace all matches

 .SH SUBCOMMANDS

@@ -92,7 +92,8 @@ Taskwarrior supports different kinds of commands.  There are read commands,
 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.
+add-on scripts, for example, shell completion (only minimal output is
+generated, as with verbose=nothing).

 .SH READ SUBCOMMANDS

@@ -121,16 +122,20 @@ Shows all tasks matching the filter, including parents of recurring tasks.

 .TP
 .B task <filter> blocked
-Shows all tasks matching the filter, that have dependencies on other tasks.
+Shows all tasks matching the filter, that are currently blocked by other tasks.
+
+.TP
+.B task <filter> blocking
+Shows all tasks matching the filter, that block other tasks.

 .TP
 .B task <filter> burndown.daily
-Shows a graphical burndown chart, by day.  Note that 'burndown' is an alias to
-the 'burndown.daily' report.
+Shows a graphical burndown chart, by day.

 .TP
 .B task <filter> burndown.weekly
-Shows a graphical burndown chart, by week.
+Shows a graphical burndown chart, by week.  Note that 'burndown' is an alias to
+the 'burndown.weekly' report.

 .TP
 .B task <filter> burndown.monthly
@@ -140,8 +145,8 @@ Shows a graphical burndown chart, by month.
 .B task calendar [due|<month> <year>|<year>] [y]
 Shows a monthly calendar with due tasks marked.  Shows one horizontal line of
 months.  If the 'y' argument is provided, will show at least one complete year.
-If a year is provided, such as '2012', then that full year is shown.  If both
-a month and a year are specified ('6 2012') then the months displayed begin at
+If a year is provided, such as '2015', then that full year is shown.  If both
+a month and a year are specified ('6 2015') then the months displayed begin at
 the specified month and year.  If the 'due' argument is provided, will show
 the starting month of the earliest due task.

@@ -151,9 +156,10 @@ Displays all possible colors, a named sample, or a legend containing all
 currently defined colors.

 .TP
-.B task columns
+.B task columns [substring]
 Displays all supported columns and formatting styles.  Useful when creating
-custom reports.
+custom reports.  If a substring is provided, only matching column names are
+shown.

 .TP
 .B task <filter> completed
@@ -168,7 +174,18 @@ Displays only a count of tasks matching the filter.
 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,
-such as export-yaml.pl.
+such as:
+
+  export-csv.pl
+  export-sql.py
+  export-xml.py
+  export-yaml.pl
+  export-html.pl
+  export-tsv.pl
+  export-xml.rb
+  export-ical.pl
+  export-xml.pl
+  export-yad.pl

 .TP
 .B task <filter> ghistory.annual
@@ -198,7 +215,7 @@ Applies the filter then extracts only the task IDs and presents them as
 a range, for example: 1-4,12.  This is useful as input to a task command,
 to achieve this:

-	task $(task project:Home ids) modify priority:H
+  task $(task project:Home ids) modify priority:H

 This example first gets the IDs for the project:Home filter, then sets
 the priority to H for each of those tasks.  This can also be achieved directly:
@@ -209,17 +226,23 @@ This command is mainly of use to external scripts.

 .TP
 .B task <filter> uuids
-Applies the filter then extracts only the task UUIDs and presents them as
+Applies the filter on all tasks (even deleted and completed tasks)
+then extracts only the task UUIDs and presents them as
 a comma-separated list.  This is useful as input to a task command, to achieve
 this:

-	task $(task project:Home status:completed uuids) modify status:pending
+  task $(task project:Home status:completed uuids) modify status:pending

 This example first gets the UUIDs for the project:Home and status:completed
-filter, then makes each of those tasks pending again.
+filters, then makes each of those tasks pending again.

 This command is mainly of use to external scripts.

+.TP
+.B task udas
+Shows a list of UDAs that are defined, including their name, type, label and
+allowed values.  Also shows UDA usage and any orphan UDAs.
+
 .TP
 .B task <filter> information
 Shows all data and metadata for the specified tasks.  This is the only means of
@@ -250,6 +273,12 @@ Shows the newest tasks matching the filter.
 Shows a page of the most urgent tasks, sorted by urgency, which is a calculated
 value.

+.TP
+.B task <filter> ready
+Shows a page of the most urgent ready tasks, sorted by urgency.  A ready task is
+one that is either unscheduled, or has a scheduled date that is past and has no
+wait date.
+
 .TP
 .B task <filter> oldest
 Shows the oldest tasks matching the filter.
@@ -269,7 +298,8 @@ Shows all recurring tasks matching the filter.

 .TP
 .B task <filter> unblocked
-Shows all tasks that do not have dependencies, matching the filter.
+Shows all tasks that are not currently blocked by other tasks, matching the
+filter.

 .TP
 .B task <filter> waiting
@@ -317,29 +347,15 @@ provided for exceptional circumstances.  Use carefully.
 .TP
 .B task import <file> [<file> ...]
 Imports tasks in the JSON format.  The standard task release comes with a few
-example scripts, such as import-yaml.pl.
+example scripts, such as:
+
+  import-todo.sh.pl
+  import-yaml.pl

 .TP
 .B task log <mods>
 Adds a new task that is already completed, to the task list.

-.TP
-.B task merge <URL>
-Merges two task databases by comparing the modifications that are stored in the
-undo.data files. The location of the second undo.data file must be passed on as
-argument. URL may have the following syntaxes:
-
-	ssh://[user@]host.xz[:port]/path/to/.task/
-
-	rsync://[user@]host.xz[:port]/path/to/.task/
-
-	[user@]host.xz:path/to/.task/
-
-	/path/to/local/.task/
-
-You can set aliases for frequently used URLs in the .taskrc. Further
-documentation can be found in task-sync(5) man page.
-
 .TP
 .B task <filter> modify <mods>
 Modifies the existing task with provided information.
@@ -348,17 +364,6 @@ Modifies the existing task with provided information.
 .B task <filter> prepend <mods>
 Prepends description text to an existing task.

-.TP
-.B task pull <URL>
-Overwrites the task database with those files found at the URL.
-(See 'merge' command for valid URL syntax.)
-
-.TP
-.B task push <URL>
-Pushes the task database to a remote another location for distributing the
-changes made by the merge command.
-(See 'merge' command for valid URL syntax.)
-
 .TP
 .B task <filter> start <mods>
 Marks the specified tasks as started.
@@ -419,13 +424,9 @@ Displays the Taskwarrior logo.
 Lists all supported reports.  This includes the built-in reports, and any custom
 reports you have defined.

-.TP
-.B task shell
-Launches an interactive shell with all the task commands available.
-
 .TP
 .B task show [all | substring]
-Shows all the current settings in the taskwarrior configuration file.  If a
+Shows all the current settings.  If a
 substring is specified just the settings containing that substring will be
 displayed.

@@ -439,7 +440,9 @@ Shows a report of aggregated task status by project.

 .TP
 .B task <filter> tags
-Show a list of all tags used.  Any special tags used are highlighted.
+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.

 .TP
 .B task timesheet [weeks]
@@ -455,6 +458,10 @@ Shows the taskwarrior version number.

 .SH HELPER SUBCOMMANDS

+.TP
+.B task _aliases
+Generates a list of all aliases, for autocompletion purposes.
+
 .TP
 .B task _columns
 Displays only a list of supported columns.
@@ -471,6 +478,20 @@ Lists all supported configuration variables, for completion purposes.
 .B task <filter> _ids
 Shows only the IDs of matching tasks, in the form of a list.

+.TP
+.B task _show
+Shows the combined defaults and overrides of the configuration settings, for use
+by third-party applications.
+
+.TP
+.B task <filter> _uuids
+Shows only the UUIDs of matching tasks among all tasks (even deleted and
+completed tasks), in the form of a list.
+
+.TP
+.B task _udas
+Shows only defined UDA names, in the form of a list.
+
 .TP
 .B task <filter> _projects
 Shows only a list of all project names used.
@@ -495,12 +516,37 @@ Generates a list of all commands, for zsh autocompletion purposes.
 .B task <filter> _zshids
 Shows the IDs and descriptions of matching tasks.

+.TP
+.B task <filter> _zshuuids
+Shows the UUIDs and descriptions of matching tasks.
+
+.TP
+.B task _get <DOM> [<DOM> ...]
+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
+  context.args
+  context.width
+  context.height
+  system.version
+  system.os
+  <id>.<attribute>
+  <uuid>.<attribute>
+
+Note that the 'rc.<name>' reference may need to be escaped using '--' to prevent
+the reference from being interpreted as an override.
+
+Note that if the DOM reference is not valid, or the reference evaluates to a
+missing value, the command exits with 1.
+
 .SH ATTRIBUTES AND METADATA

 .TP
 .B ID
-Tasks can be specified uniquely by IDs, which are simply the index of the
-task in the data file.  The ID of a task may therefore change, but only when
+Tasks can be specified uniquely by IDs, which are simply the indexes of the
+tasks in the data file.  The ID of a task may therefore change, but only when
 a command is run that displays IDs.  When modifying tasks, it is safe to
 rely on the last displayed ID.  Always run a report to check you have the right
 ID for a task. IDs can be given to task as a sequence, for example,
@@ -514,7 +560,7 @@ Tags are arbitrary words associated with a task. Use + to add a tag and - to
 remove a tag from a task. A task can have any quantity of tags.

 Certain tags (called 'special tags'), can be used to affect the way tasks are
-treated.  For example, is a task has the special tag 'nocolor', then it is
+treated.  For example, if a task has the special tag 'nocolor', then it is
 exempt from all color rules.  The supported special tags are:

    +nocolor     Disable color rules processing for this task
@@ -522,6 +568,38 @@ exempt from all color rules.  The supported special tags are:
    +nocal       This task will not appear on the calendar
    +next        Elevates task so it appears on 'next' report

+There are also virtual tags, which represent task metadata in tag form.  These
+tags do not exist, but can be used to filter tasks.  The supported virtual tags
+are:
+
+    BLOCKED      Matches if the task is blocked
+    UNBLOCKED    Matches if the task is not blocked
+    BLOCKING     Matches if the task is blocking
+    YESTERDAY    Matches if the task was due sometime yesterday
+    DUE          Matches if the task is due
+    DUETODAY     Matches if the task is due today
+    TODAY        Matches if the task is due today
+    TOMORROW     Matches if the task is due sometime tomorrow
+    WEEK         Matches if the task is due this week
+    MONTH        Matches if the task is due this month
+    YEAR         Matches if the task is due this year
+    OVERDUE      Matches if the task is overdue
+    ACTIVE       Matches if the task is started
+    SCHEDULED    Matches if the task is scheduled
+    READY        Matches if the task is actionable
+    PARENT       Matches if the task is a parent
+    CHILD        Matches if the task has a parent
+    UNTIL        Matches if the task expires
+    WAITING      Matches if the task is waiting
+    ANNOTATED    Matches if the task has annotations
+    TAGGED       Matches if the task has tags
+    PENDING      Matches if the task has pending status
+    COMPLETED    Matches if the task has completed status
+    DELETED      Matches if the task has deleted status
+
+You can use +BLOCKED to filter blocked tasks, or -BLOCKED for unblocked tasks.
+Similarly, -BLOCKED is equivalent to +UNBLOCKED.
+
 .TP
 .B project:<project-name>
 Specifies the project to which a task is related to.
@@ -539,16 +617,12 @@ Specifies the due-date of a task.
 Specifies the frequency of a recurrence of a task.

 .TP
-.B until:<end-date-of-recurrence>
-Specifies the Recurrence end-date of a task.
+.B scheduled:<ready-date>
+Specifies the date after which a task can be accomplished.

 .TP
-.B fg:<color-spec>
-Specifies foreground color. Deprecated.
-
-.TP
-.B bg:<color-spec>
-Specifies background color. Deprecated.
+.B until:<expiration date of task>
+Specifies the expiration date of a task, after which it will be deleted.

 .TP
 .B limit:<number-of-rows>
@@ -565,13 +639,13 @@ Date until task becomes pending.
 .B depends:<id1,id2 ...>
 Declares this task to be dependent on id1 and id2.  This means that the tasks
 id1 and id2 should be completed before this task.  Consequently, this task will
-then show up on the 'blocked' report.
+then show up on the 'blocked' report.  It accepts a comma-separated list of ID
+numbers, UUID numbers and ID ranges.  When prefixing any element of this list
+by '-', the specified tasks are removed from the dependency list.

 .TP
 .B entry:<entry-date>
-For report purposes, specifies the date that a task was created.  The entry
-attribute cannot be directly specified using task add, and should not be edited
-after creating the task.
+For report purposes, specifies the date that a task was created.

 .SH ATTRIBUTE MODIFIERS
 Attribute modifiers improve filters.  Supported modifiers are:
@@ -705,7 +779,7 @@ For example:
  task '( due < eom or priority != L )'  list

 Note that the parentheses are required when using a logical operator other than
-the 'and' operator.  The reason is that some report contains filters that must
+the 'and' operator.  The reason is that some reports contain filters that must
 be combined with the command line.  Consider this example:

  task project:Home or project:Garden list
@@ -754,7 +828,7 @@ Taskwarrior reads dates from the command line and displays dates in the
 reports.  The expected and desired date format is determined by the
 configuration variable
 .I dateformat
-in the taskwarrior configuration file.
+.

 .RS
 .TP
@@ -763,10 +837,12 @@ task ... due:7/14/2008

 .TP
 ISO-8601
-task ... due:20120314T223000Z
+task ... due:20130314T223000Z

 .TP
 Relative wording
+task ... due:now
+.br
 task ... due:today
 .br
 task ... due:yesterday
@@ -784,7 +860,7 @@ task ... due:1day
 task ... due:9hrs

 .TP
-Start of (work) week (Monday), calendar week (Sunday or Monday), month, quarter and year
+Start of next (work) week (Monday), calendar week (Sunday or Monday), month, quarter and year
 .br
 task ... due:sow
 .br
@@ -799,7 +875,7 @@ task ... due:soq
 task ... due:soy

 .TP
-End of (work) week (Friday), calendar week (Saturday or Sunday), month, quarter and year
+End of current (work) week (Friday), calendar week (Saturday or Sunday), month, quarter and year
 .br
 task ... due:eow
 .br
@@ -825,6 +901,22 @@ This sets the wait date to 1/18/2038.
 .TP
 Next occurring weekday
 task ... due:fri
+
+.TP
+Predictable holidays
+task ... due:goodfriday
+.br
+task ... due:easter
+.br
+task ... due:eastermonday
+.br
+task ... due:ascension
+.br
+task ... due:pentecost
+.br
+task ... due:midsommar
+.br
+task ... due:midsommarafton
 .RE

 .SS FREQUENCIES
@@ -945,7 +1037,8 @@ Taskwarrior stores its configuration in a file in the user's home directory:
 .B task rc:<path-to-alternate-file> ...
 Specifies an alternate configuration file.

-.TP TASKRC=/tmp/.taskrc task ..
+.TP
+.B TASKRC=/tmp/.taskrc task ..
 The environment variable overrides the default and the command line
 specification of the .taskrc file.

@@ -961,13 +1054,7 @@ the 'data.location' configuration setting of the task data directory.

 .SH MORE EXAMPLES

-For examples please see the task tutorial man page at
-
-.RS
-man task-tutorial
-.RE
-
-or the online documentation starting at
+For examples please see the online documentation starting at

 .RS
 <http://taskwarrior.org/projects/taskwarrior/wiki>
@@ -995,22 +1082,20 @@ The file that contains the tasks that are not yet done.

 .TP
 ~/.task/completed.data
-The file that contains the completed "done" tasks.
+The file that contains the completed ("done") tasks.

 .TP
 ~/.task/undo.data
-The file that contains the information to the "undo" command.
+The file that contains information needed by the "undo" command.

 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2015 P. Beckingham, F. Hernandez.

 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.

 .SH SEE ALSO
 .BR taskrc(5),
-.BR task-tutorial(5),
-.BR task-faq(5),
 .BR task-color(5),
 .BR task-sync(5)

@@ -1022,7 +1107,7 @@ The official site at

 .TP
 The official code repository at
-<git://tasktools.org/task.git/>
+<https://git.tasktools.org/scm/tm/task.git>

 .TP
 You can contact the project by emailing
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
--- a/doc/misc/themes/README
+++ b/doc/misc/themes/README
@@ -6,7 +6,7 @@ that need to be illustrated in theme sample.

 Then edit the 'rc' file to include the desired theme file.

-Then run 'per' once per theme, and capture the display.
+Then run 'per' to run a few commands for each theme.

 Note that this will require that the terminal window be switched between a black
 and white background to properly show the light and dark themes.
--- a/doc/misc/themes/per
+++ b/doc/misc/themes/per
@@ -1,8 +0,0 @@
-echo '$ task list'
-task rc:rc list | grep -v alternate
-echo '$ task summary'
-task rc:rc summary | grep -v alternate
-echo '$ task ghistory'
-task rc:rc ghistory | grep -v alternate
-echo '$ task calendar'
-task rc:rc calendar | grep -v alternate
--- a/doc/misc/themes/run
+++ b/doc/misc/themes/run
@@ -1,47 +1,23 @@
-rm pending.data completed.data undo.data rc

-cat <<EOF >>rc

+for theme in $PWD/../../rc/*.theme
+do
+  cat <<EOF >>x
 data.location=.
 confirmation=off
 _forcecolor=on
-
-#include ~/task-2.0.0.git/doc/rc/light-16.theme
-#include ~/task-2.0.0.git/doc/rc/dark-16.theme
-#include ~/task-2.0.0.git/doc/rc/light-256.theme
-#include ~/task-2.0.0.git/doc/rc/dark-256.theme
-#include ~/task-2.0.0.git/doc/rc/dark-gray-256.theme
-#include ~/task-2.0.0.git/doc/rc/dark-red-256.theme
-#include ~/task-2.0.0.git/doc/rc/dark-green-256.theme
-#include ~/task-2.0.0.git/doc/rc/dark-blue-256.theme
-include ~/task-2.0.0.git/doc/rc/dark-violets-256.theme
-#include ~/task-2.0.0.git/doc/rc/dark-yellow-green.theme
-#include ~/task-2.0.0.git/doc/rc/solarized-dark-256.theme
-#include ~/task-2.0.0.git/doc/rc/solarized-light-256.theme
-
+include $theme
 EOF

-task rc:rc add Ordinary task
-task rc:rc add Started task
-task rc:rc 2 start
-task rc:rc add High priority task pri:H
-task rc:rc add Medium priority task pri:M
-task rc:rc add Low priority task pri:L
-task rc:rc add Household task project:Home
-task rc:rc add Outdoor task project:Garden
-task rc:rc add Overdue task due:yesterday
-task rc:rc add Due task due:tomorrow
-task rc:rc add Not yet due tasks due:2/14/2012
-task rc:rc add Recurring task due:eom recur:monthly
-task rc:rc add Tagged task +tag1
-task rc:rc add Blocking task
-task rc:rc add Dependent task
-
-task rc:rc log Completed_1 project:Garden
-task rc:rc log Completed_2 project:Garden
-task rc:rc log Completed_3 project:Home
-task rc:rc add Deleted_1
-
-task rc:rc 14 mod depends:13
-task rc:rc 15 delete
-
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
--- a/doc/misc/themes/run.dark
+++ b/doc/misc/themes/run.dark
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+for theme in $PWD/../../rc/dark-16.theme \
+             $PWD/../../rc/dark-256.theme \
+             $PWD/../../rc/dark-blue-256.theme \
+             $PWD/../../rc/dark-gray-256.theme \
+             $PWD/../../rc/dark-gray-blue-256.theme \
+             $PWD/../../rc/dark-green-256.theme \
+             $PWD/../../rc/dark-red-256.theme \
+             $PWD/../../rc/dark-violets-256.theme \
+             $PWD/../../rc/dark-yellow-green.theme
+do
+  cat <<EOF >x
+data.location=.
+confirmation=off
+detection=off
+_forcecolor=on
+default.height=24
+verbose=off
+include $theme
+EOF
+
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
--- a/doc/misc/themes/run.light
+++ b/doc/misc/themes/run.light
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+for theme in $PWD/../../rc/light-16.theme \
+             $PWD/../../rc/light-256.theme
+do
+  cat <<EOF >x
+data.location=.
+confirmation=off
+detection=off
+_forcecolor=on
+default.height=24
+verbose=off
+include $theme
+EOF
+
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
--- a/doc/misc/themes/run.solar.dark
+++ b/doc/misc/themes/run.solar.dark
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+for theme in $PWD/../../rc/solarized-dark-256.theme
+do
+  cat <<EOF >x
+data.location=.
+confirmation=off
+detection=off
+_forcecolor=on
+default.height=24
+verbose=off
+include $theme
+EOF
+
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
--- a/doc/misc/themes/run.solar.light
+++ b/doc/misc/themes/run.solar.light
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+for theme in $PWD/../../rc/solarized-light-256.theme
+do
+  cat <<EOF >x
+data.location=.
+confirmation=off
+detection=off
+_forcecolor=on
+default.height=24
+verbose=off
+include $theme
+EOF
+
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
--- a/doc/misc/themes/setup
+++ b/doc/misc/themes/setup
@@ -0,0 +1,33 @@
+rm pending.data completed.data undo.data x
+
+cat <<EOF >>x
+
+data.location=.
+confirmation=off
+_forcecolor=on
+EOF
+
+task rc:x add Ordinary task
+task rc:x add Started task
+task rc:x 2 start
+task rc:x add High priority task pri:H
+task rc:x add Medium priority task pri:M
+task rc:x add Low priority task pri:L
+task rc:x add Household task project:Home
+task rc:x add Outdoor task project:Garden
+task rc:x add Overdue task due:yesterday
+task rc:x add Due task due:tomorrow
+task rc:x add Not yet due tasks due:eom
+task rc:x add Recurring task due:eom recur:monthly
+task rc:x add Tagged task +tag1
+task rc:x add Blocking task
+task rc:x add Dependent task
+
+task rc:x log Completed_1 project:Garden
+task rc:x log Completed_2 project:Garden
+task rc:x log Completed_3 project:Home
+task rc:x add Deleted_1
+
+task rc:x 14 mod depends:13
+task rc:x 15 delete
+
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -1,9 +1,6 @@
-################################################################################
-# Sample taskwarrior 1.9 (or later) dark 16-color theme
+###############################################################################
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,79 @@
 #
 ###############################################################################

-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=
 color.header=yellow
 color.footnote=yellow
+color.warning=bold red
+color.error=yellow
 color.debug=yellow

-color.summary.bar=black on green
-color.summary.background=white on black
+# Task state
+color.completed=green on white
+color.deleted=red on white
+color.active=black on bright green
+color.recurring=magenta
+color.scheduled=on green
+color.until=
+color.blocked=black on white
+color.blocking=black on bright white

-color.history.add=black on red
-color.history.done=black on green
-color.history.delete=black on yellow
+# Project
+color.project.none=

+# Priority
+color.pri.H=bold white
+color.pri.M=white
+color.pri.L=
+color.pri.none=
+
+# Tags
+color.tag.next=bold yellow
+color.tag.none=
+color.tagged=green
+
+# Due
+color.due=red
+color.due.today=red
+color.overdue=bold red
+
+# UDA
+#color.uda.X=
+
+# Report: burndown
+color.burndown.done=on green
 color.burndown.pending=on red
 color.burndown.started=on yellow
-color.burndown.done=on green

+# Report: history
+color.history.add=black on red
+color.history.delete=black on yellow
+color.history.done=black on green
+
+# Report: summary
+color.summary.background=white on black
+color.summary.bar=black on green
+
+# Command: calendar
+color.calendar.due=white on red
+color.calendar.due.today=bold white on red
+color.calendar.holiday=black on bright yellow
+color.calendar.overdue=black on bright red
+color.calendar.today=bold white on bright blue
+color.calendar.weekend=white on bright black
+color.calendar.weeknumber=bold blue
+
+# Command: sync
 color.sync.added=green
 color.sync.changed=yellow
 color.sync.rejected=red

-color.undo.before=red
+# Command: undo
 color.undo.after=green
-
-color.calendar.today=bold white on bright blue
-color.calendar.due=white on red
-color.calendar.due.today=bold white on red
-color.calendar.overdue=black on bright red
-color.calendar.weekend=white on bright black
-color.calendar.holiday=black on bright yellow
-color.calendar.weeknumber=bold blue
-
-color.recurring=magenta
-color.overdue=bold red
-color.due.today=red
-color.due=red
-color.active=black on bright green
-color.pri.none=
-color.pri.H=bold white
-color.pri.M=white
-color.pri.L=
-color.tagged=green
-color.blocked=black on white
-color.project.none=
-color.tag.none=
-color.alternate=
+color.undo.before=red

--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -1,9 +1,6 @@
 ###############################################################################
-# Sample taskwarrior 1.9 (or later) dark 256-color theme
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,76 @@
 #
 ###############################################################################

-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on gray1
 color.header=color3
 color.footnote=color3
+color.warning=bold red
+color.error=color3
 color.debug=color3

-color.summary.bar=black on rgb141
-color.summary.background=white on color0
+# Task state
+color.completed=rgb010 on white
+color.deleted=rgb100 on white
+color.active=rgb555 on rgb410
+color.recurring=rgb013
+color.scheduled=on rgb001
+color.until=
+color.blocked=white on color8
+color.blocking=white on color15

-color.history.add=color0 on rgb500
-color.history.done=color0 on rgb050
-color.history.delete=color0 on rgb550
+# Project
+color.project.none=

+# Priority
+color.pri.H=color255
+color.pri.L=color245
+color.pri.M=color250
+color.pri.none=
+
+# Tags
+color.tag.next=rgb440
+color.tag.none=
+color.tagged=rgb031
+
+# Due
+color.due.today=rgb400
+color.due=color1
+color.overdue=color9
+
+# Report: burndown
+color.burndown.done=on rgb010
 color.burndown.pending=on color9
 color.burndown.started=on color11
-color.burndown.done=on rgb010

+# Report: history
+color.history.add=color0 on rgb500
+color.history.delete=color0 on rgb550
+color.history.done=color0 on rgb050
+
+# Report: summary
+color.summary.background=white on color0
+color.summary.bar=black on rgb141
+
+# Command: calendar
+color.calendar.due.today=color15 on color1
+color.calendar.due=color0 on color1
+color.calendar.holiday=color0 on color11
+color.calendar.overdue=color0 on color9
+color.calendar.today=color15 on rgb013
+color.calendar.weekend=on color235
+color.calendar.weeknumber=rgb013
+
+# Command: sync
 color.sync.added=rgb010
 color.sync.changed=color11
 color.sync.rejected=color9

-color.undo.before=color1
+# Command: undo
 color.undo.after=color2
-
-color.calendar.today=color15 on rgb013
-color.calendar.due=color0 on color1
-color.calendar.due.today=color15 on color1
-color.calendar.overdue=color0 on color9
-color.calendar.weekend=on color235
-color.calendar.holiday=color0 on color11
-color.calendar.weeknumber=rgb013
-
-color.recurring=rgb013
-color.overdue=color9
-color.due.today=rgb400
-color.due=color1
-color.active=rgb555 on rgb410
-color.pri.none=
-color.pri.H=color255
-color.pri.M=color250
-color.pri.L=color245
-color.tagged=rgb031
-color.blocked=white on color8
-color.project.none=
-color.tag.none=
-color.alternate=on color233
+color.undo.before=color1

--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -1,9 +1,6 @@
 ###############################################################################
-# Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring blue.
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,76 @@
 #
 ###############################################################################

-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on gray1
 color.header=rgb013
 color.footnote=rgb013
+color.warning=bold red
+color.error=rgb013
 color.debug=rgb013

-color.summary.bar=white on rgb003
-color.summary.background=white on color0
+# Task state
+color.completed=rgb001 on white
+color.deleted=rgb100 on white
+color.active=rgb045 on rgb015
+color.recurring=rgb115
+color.scheduled=on rgb011
+color.until=
+color.blocked=white on rgb001
+color.blocking=white on rgb002

-color.history.add=color0 on rgb015
-color.history.done=color0 on rgb025
-color.history.delete=color0 on rgb035
+# Project
+color.project.none=

+# Priority
+color.pri.H=rgb035
+color.pri.L=rgb015
+color.pri.M=rgb025
+color.pri.none=
+
+# Tags
+color.tag.next=rgb550
+color.tag.none=
+color.tagged=color246
+
+# Due
+color.due.today=color252
+color.due=color249
+color.overdue=color255
+
+# Report: burndown
+color.burndown.done=on gray4
 color.burndown.pending=on rgb004
 color.burndown.started=on rgb015
-color.burndown.done=on gray4

+# Report: history
+color.history.add=color0 on rgb015
+color.history.delete=color0 on rgb035
+color.history.done=color0 on rgb025
+
+# Report: summary
+color.summary.background=white on color0
+color.summary.bar=white on rgb003
+
+# Command: calendar
+color.calendar.due.today=color0 on color252
+color.calendar.due=color0 on color249
+color.calendar.holiday=color255 on rgb013
+color.calendar.overdue=color0 on color255
+color.calendar.today=color0 on rgb115
+color.calendar.weekend=on color235
+color.calendar.weeknumber=rgb015
+
+# Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb015
 color.sync.rejected=rgb004

-color.undo.before=rgb013
+# Command: undo
 color.undo.after=rgb035
-
-color.calendar.today=color0 on rgb115
-color.calendar.due=color0 on color249
-color.calendar.due.today=color0 on color252
-color.calendar.overdue=color0 on color255
-color.calendar.weekend=on color235
-color.calendar.holiday=color255 on rgb013
-color.calendar.weeknumber=rgb015
-
-color.recurring=rgb115
-color.overdue=color255
-color.due.today=color252
-color.due=color249
-color.active=rgb045 on rgb015
-color.pri.none=
-color.pri.H=rgb035
-color.pri.M=rgb025
-color.pri.L=rgb015
-color.tagged=color246
-color.blocked=white on rgb001
-color.project.none=
-color.tag.none=
-color.alternate=on color233
+color.undo.before=rgb013

--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -1,9 +1,6 @@
 ###############################################################################
-# Sample taskwarrior 1.9 (or later) dark gray 256-color theme
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,76 @@
 #
 ###############################################################################

-color=on
-color.header=color8
-color.footnote=color8
-color.debug=color8
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.

-color.summary.bar=black on gray12
-color.summary.background=white on gray3
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on gray1
+color.header=color0 on gray11
+color.footnote=on gray5
+color.warning=bold red
+color.error=red on white
+color.debug=black on white

-color.history.add=color0 on gray6
-color.history.done=color0 on gray15
-color.history.delete=color0 on gray10
+# Task state
+color.completed=black on white
+color.deleted=black on white
+color.active=black on gray18
+color.recurring=
+color.scheduled=on gray8
+color.until=
+color.blocked=gray13
+color.blocking=bold white

-color.burndown.pending=on gray6
-color.burndown.started=on gray15
-color.burndown.done=on gray10
-
-color.sync.added=gray10
-color.sync.changed=gray15
-color.sync.rejected=gray6
-
-color.undo.before=gray6
-color.undo.after=gray15
-
-color.calendar.today=color8 on color15
-color.calendar.due=color7 on color8
-color.calendar.due.today=color15 on color8
-color.calendar.overdue=underline color0 on color7
-color.calendar.weekend=on color235
-color.calendar.holiday=color7 on color15
-color.calendar.weeknumber=gray4
-
-color.recurring=gray8
-color.overdue=color0 on color15
-color.due.today=underline color0 on color7
-color.due=color7
-color.active=color7 on color8
-color.pri.none=
-color.pri.H=color15
-color.pri.M=color7
-color.pri.L=color8
-color.tagged=gray12
-color.blocked=color15 on color8
+# Project
 color.project.none=
-color.tag.none=
-color.alternate=on gray2
+
+# Priority
+color.pri.H=gray21
+color.pri.M=gray18
+color.pri.L=gray12
+color.pri.none=gray18
+
+# Tags
+color.tag.next=bold white
+color.tag.none=
+color.tagged=
+
+# Due
+color.due=on gray2
+color.due.today=on gray4
+color.overdue=on gray6
+
+# Report: burndown
+color.burndown.pending=gray15 on gray5
+color.burndown.started=black on gray10
+color.burndown.done=gray5 on gray23
+
+# Report: history
+color.history.add=gray15 on gray5
+color.history.delete=black on gray10
+color.history.done=gray5 on gray23
+
+# Report: summary
+color.summary.bar=on gray15
+color.summary.background=on black
+
+# Command: calendar
+color.calendar.due=on gray8
+color.calendar.due.today=on gray15
+color.calendar.holiday=black on gray20
+color.calendar.overdue=gray2 on gray10
+color.calendar.today=bold white
+color.calendar.weekend=on gray2
+color.calendar.weeknumber=gray6
+
+# Command: sync
+color.sync.add=gray15 on gray5
+color.sync.changed=black on gray10
+color.sync.rejected=gray5 on gray23
+
+# Command: undo
+color.undo.before=white on black
+color.undo.after=black on white

--- a/doc/rc/dark-gray-blue-256.theme
+++ b/doc/rc/dark-gray-blue-256.theme
@@ -0,0 +1,99 @@
+###############################################################################
+#
+# Copyright 2006 - 2015, 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
+#
+###############################################################################
+
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on gray0
+color.header=gray10
+color.footnote=gray10
+color.warning=
+color.error=rgb500
+color.debug=rgb500
+
+# Task state
+color.completed=
+color.deleted=
+color.active=color15 on rgb035
+color.recurring=
+color.scheduled=
+color.until=
+color.blocked=bold gray10 on gray4
+color.blocking=bold gray18 on gray6
+
+# Project
+color.project.none=
+
+# Priority
+color.pri.H=
+color.pri.L=
+color.pri.M=
+color.pri.none=
+
+# Tags
+color.tag.next=
+color.tag.none=
+color.tagged=
+
+# Due
+color.due=color0 on rgb013
+color.due.today=color0 on rgb024
+color.overdue=color0 on rgb035
+
+# Report: burndown
+color.burndown.pending=on gray9
+color.burndown.started=on gray16
+color.burndown.done=on rgb013
+
+# Report: history
+color.history.add=on gray9
+color.history.delete=black on gray23
+color.history.done=black on rgb013
+
+# Report: summary
+color.summary.bar=on rgb012
+color.summary.background=on color0
+
+# Command: calendar
+color.calendar.due=color0 on gray10
+color.calendar.due.today=color0 on gray15
+color.calendar.holiday=color15 on rgb005
+color.calendar.overdue=color0 on gray20
+color.calendar.today=underline black on color15
+color.calendar.weekend=on gray4
+color.calendar.weeknumber=gray10
+
+# Command: sync
+color.sync.added=gray10
+color.sync.changed=gray15
+color.sync.rejected=gray23
+
+# Command: undo
+color.undo.before=green
+color.undo.after=red
+
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -1,9 +1,6 @@
 ###############################################################################
-# Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring green.
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,75 @@
 #
 ###############################################################################

-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on gray1
 color.header=rgb031
 color.footnote=rgb031
+color.warning=bold red
+color.error=rgb031
 color.debug=rgb031

-color.summary.bar=white on rgb030
-color.summary.background=white on color0
+# Task state
+color.completed=rgb020 on white
+color.deleted=rgb200 on white
+color.active=rgb050 on rgb010
+color.recurring=rgb151
+color.scheduled=on rgb011
+color.until=
+color.blocked=white on rgb010
+color.blocking=white on rgb020

-color.history.add=color0 on rgb010
-color.history.done=color0 on rgb030
-color.history.delete=color0 on rgb050
+# Project
+color.project.none=

+# Priority
+color.pri.H=rgb050
+color.pri.L=rgb010
+color.pri.M=rgb030
+color.pri.none=
+
+# Tags
+color.tag.next=rgb440
+color.tag.none=
+color.tagged=color246
+
+# Due
+color.due.today=color252
+color.due=color249
+color.overdue=color255
+
+# Report: burndown
+color.burndown.done=on gray4
 color.burndown.pending=on rgb010
 color.burndown.started=on rgb030
-color.burndown.done=on gray4

+# Report: history
+color.history.add=color0 on rgb010
+color.history.delete=color0 on rgb050
+color.history.done=color0 on rgb030
+
+# Report: summary
+color.summary.background=white on color0
+color.summary.bar=white on rgb030
+
+# Command: calendar
+color.calendar.due.today=color0 on color225
+color.calendar.due=color0 on color249
+color.calendar.holiday=rgb151 on rgb020
+color.calendar.overdue=color0 on color255
+color.calendar.today=color0 on rgb151
+color.calendar.weekend=on color235
+color.calendar.weeknumber=rgb010
+
+# Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb030
 color.sync.rejected=rgb010

-color.undo.before=rgb031
+# Command: undo
 color.undo.after=rgb053
-
-color.calendar.today=color0 on rgb151
-color.calendar.due=color0 on color249
-color.calendar.due.today=color0 on color225
-color.calendar.overdue=color0 on color255
-color.calendar.weekend=on color235
-color.calendar.holiday=rgb151 on rgb020
-color.calendar.weeknumber=rgb010
-
-color.recurring=rgb151
-color.overdue=color255
-color.due.today=color252
-color.due=color249
-color.active=rgb050 on rgb010
-color.pri.none=
-color.pri.H=rgb050
-color.pri.M=rgb030
-color.pri.L=rgb010
-color.tagged=color246
-color.blocked=white on rgb010
-color.project.none=
-color.tag.none=
-color.alternate=on color233
-
+color.undo.before=rgb031
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -1,9 +1,6 @@
 ###############################################################################
-# Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring red.
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,76 @@
 #
 ###############################################################################

-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on gray1
 color.header=rgb100
 color.footnote=rgb100
+color.warning=bold red
+color.error=rgb100
 color.debug=rgb100

-color.summary.bar=white on rgb300
-color.summary.background=white on color0
+# Task state
+color.completed=rgb020 on white
+color.deleted=rgb200 on white
+color.active=rgb500 on rgb100
+color.recurring=rgb511
+color.scheduled=on rgb201
+color.until=
+color.blocked=white on rgb100
+color.blocking=white on rgb200

-color.history.add=color0 on rgb100
-color.history.done=color0 on rgb300
-color.history.delete=color0 on rgb500
+# Project
+color.project.none=

+# Priority
+color.pri.H=rgb500
+color.pri.L=rgb300
+color.pri.M=rgb400
+color.pri.none=
+
+# Tags
+color.tag.next=rgb440
+color.tag.none=
+color.tagged=color246
+
+# Due
+color.due.today=color252
+color.due=color249
+color.overdue=color255
+
+# Report: burndown
+color.burndown.done=on gray4
 color.burndown.pending=on rgb200
 color.burndown.started=on rgb411
-color.burndown.done=on gray4

+# Report: history
+color.history.add=color0 on rgb100
+color.history.delete=color0 on rgb500
+color.history.done=color0 on rgb300
+
+# Report: summary
+color.summary.background=white on color0
+color.summary.bar=white on rgb300
+
+# Command: calendar
+color.calendar.due.today=color0 on color252
+color.calendar.due=color0 on color249
+color.calendar.holiday=rgb522 on rgb300
+color.calendar.overdue=color0 on color255
+color.calendar.today=color0 on rgb511
+color.calendar.weekend=on color235
+color.calendar.weeknumber=rgb100
+
+# Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb411
 color.sync.rejected=rgb200

-color.undo.before=rgb301
+# Command: undo
 color.undo.after=rgb503
-
-color.calendar.today=color0 on rgb511
-color.calendar.due=color0 on color249
-color.calendar.due.today=color0 on color252
-color.calendar.overdue=color0 on color255
-color.calendar.weekend=on color235
-color.calendar.holiday=rgb522 on rgb300
-color.calendar.weeknumber=rgb100
-
-color.recurring=rgb511
-color.overdue=color255
-color.due.today=color252
-color.due=color249
-color.active=rgb500 on rgb100
-color.pri.none=
-color.pri.H=rgb500
-color.pri.M=rgb400
-color.pri.L=rgb300
-color.tagged=color246
-color.blocked=white on rgb100
-color.project.none=
-color.tag.none=
-color.alternate=on color233
+color.undo.before=rgb301

--- a/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@@ -1,9 +1,6 @@
-################################################################################
-# Sample taskwarrior 1.9 (or later) dark violet 256-color theme
+###############################################################################
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,76 @@
 #
 ###############################################################################

-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on gray2
 color.header=rgb013
 color.footnote=rgb013
+color.warning=
+color.error=rgb013
 color.debug=rgb013

-color.summary.bar=white on rgb103
-color.summary.background=white on color0
+# Task state
+color.completed=
+color.deleted=
+color.active=rgb445 on rgb213
+color.recurring=rgb115
+color.scheduled=
+color.until=
+color.blocked=white on rgb101
+color.blocking=white on rgb202

-color.history.add=color0 on rgb105
-color.history.done=color0 on rgb205
-color.history.delete=color0 on rgb305
+# Project
+color.project.none=

+# Priority
+color.pri.H=rgb404
+color.pri.M=rgb304
+color.pri.L=rgb325
+color.pri.none=
+
+# Tags
+color.tag.next=
+color.tag.none=
+color.tagged=rgb334
+
+# Due
+color.due=rgb055
+color.due.today=rgb533
+color.overdue=color9
+
+# Report: burndown
 color.burndown.pending=on rgb103
 color.burndown.started=on rgb214
 color.burndown.done=on gray4

+# Report: history
+color.history.add=color0 on rgb105
+color.history.done=color0 on rgb205
+color.history.delete=color0 on rgb305
+
+# Report: summary
+color.summary.bar=white on rgb103
+color.summary.background=white on color0
+
+# Command: calendar
+color.calendar.due=color0 on rgb325
+color.calendar.due.today=color0 on rgb404
+color.calendar.holiday=color15 on rgb022
+color.calendar.overdue=color0 on color9
+color.calendar.today=color15 on rgb103
+color.calendar.weekend=gray12 on gray3
+color.calendar.weeknumber=rgb104
+
+# Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb214
 color.sync.rejected=rgb103

+# Command: undo
 color.undo.before=rgb103
 color.undo.after=rgb305

-color.calendar.today=color15 on rgb103
-color.calendar.due=color0 on rgb325
-color.calendar.due.today=color0 on rgb404
-color.calendar.overdue=color0 on color9
-color.calendar.weekend=gray12 on gray3
-color.calendar.holiday=color15 on rgb022
-color.calendar.weeknumber=rgb104
-
-color.recurring=rgb115
-color.overdue=color9
-color.due.today=rgb533
-color.due=rgb055
-color.active=rgb445 on rgb213
-color.pri.none=
-color.pri.H=rgb404
-color.pri.M=rgb304
-color.pri.L=rgb325
-color.tagged=rgb334
-color.blocked=white on rgb101
-color.project.none=
-color.tag.none=
-color.alternate=on gray2
-
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -1,9 +1,6 @@
-################################################################################
-# Sample taskwarrior 1.9 (or later) dark-yellow-green 256-color theme
+###############################################################################
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,76 @@
 #
 ###############################################################################

-color=on
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on gray2
 color.header=rgb031
 color.footnote=rgb031
+color.warning=
+color.error=rgb031
 color.debug=rgb031

-color.summary.bar=white on rgb030
-color.summary.background=white on color0
+# Task state
+color.completed=
+color.deleted=
+color.active=rgb451 on rgb310
+color.recurring=rgb343
+color.scheduled=
+color.until=
+color.blocked=white on rgb110
+color.blocking=white on rgb220

-color.history.add=color0 on rgb010
-color.history.done=color0 on rgb030
-color.history.delete=color0 on rgb050
+# Project
+color.project.none=

+# Priority
+color.pri.H=rgb450
+color.pri.M=rgb030
+color.pri.L=rgb010
+color.pri.none=
+
+# Tags
+color.tag.next=
+color.tag.none=
+color.tagged=rgb342
+
+# Due
+color.due=rgb420
+color.due.today=rgb410
+color.overdue=rgb400
+
+# Report: burndown
 color.burndown.pending=on rgb110
 color.burndown.started=on rgb430
 color.burndown.done=on gray4

+# Report: history
+color.history.add=color0 on rgb010
+color.history.done=color0 on rgb030
+color.history.delete=color0 on rgb050
+
+# Report: summary
+color.summary.bar=white on rgb030
+color.summary.background=white on color0
+
+# Command: calendar
+color.calendar.due=color0 on rgb430
+color.calendar.due.today=color0 on rgb410
+color.calendar.holiday=rgb151 on rgb020
+color.calendar.overdue=color0 on rgb400
+color.calendar.today=color15 on rgb110
+color.calendar.weekend=on color235
+color.calendar.weeknumber=rgb110
+
+# Command: sync
 color.sync.added=gray4
 color.sync.changed=rgb430
 color.sync.rejected=rgb110

+# Command: undo
 color.undo.before=rgb031
 color.undo.after=rgb053

-color.calendar.today=color15 on rgb110
-color.calendar.due=color0 on rgb430
-color.calendar.due.today=color0 on rgb410
-color.calendar.overdue=color0 on rgb400
-color.calendar.weekend=on color235
-color.calendar.holiday=rgb151 on rgb020
-color.calendar.weeknumber=rgb110
-
-color.recurring=rgb343
-color.overdue=rgb400
-color.due.today=rgb410
-color.due=rgb420
-color.active=rgb451 on rgb310
-color.pri.none=
-color.pri.H=rgb450
-color.pri.M=rgb030
-color.pri.L=rgb010
-color.tagged=rgb342
-color.blocked=white on rgb110
-color.project.none=
-color.tag.none=
-color.alternate=on gray0
-
--- a/doc/rc/holidays.be-BY.rc
+++ b/doc/rc/holidays.be-BY.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/be-BY/2012.json
-# http://holidata.net/be-BY/2013.json
+# http://holidata.net/be-BY/2014.json
+# http://holidata.net/be-BY/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,42 +28,62 @@
 ###############################################################################

 holiday.be-BY1.name=Новы Год
-holiday.be-BY1.date=20120101
+holiday.be-BY1.date=20140101
 holiday.be-BY2.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY2.date=20120107
+holiday.be-BY2.date=20140107
 holiday.be-BY3.name=Міжнародны жаночы дзень
-holiday.be-BY3.date=20120803
+holiday.be-BY3.date=20140803
 holiday.be-BY4.name=Пасха(праваслаўная)
-holiday.be-BY4.date=20120415
+holiday.be-BY4.date=20140420
 holiday.be-BY5.name=Радуніца
-holiday.be-BY5.date=20120424
+holiday.be-BY5.date=20140429
 holiday.be-BY6.name=Свята працы
-holiday.be-BY6.date=20120501
+holiday.be-BY6.date=20140501
 holiday.be-BY7.name=Дзень Перамогі
-holiday.be-BY7.date=20120509
+holiday.be-BY7.date=20140509
 holiday.be-BY8.name=Дзень незалежнаці
-holiday.be-BY8.date=20120703
+holiday.be-BY8.date=20140703
 holiday.be-BY9.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY9.date=20121107
+holiday.be-BY9.date=20141107
 holiday.be-BY10.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY10.date=20121225
+holiday.be-BY10.date=20141225
 holiday.be-BY11.name=Новы Год
-holiday.be-BY11.date=20130101
+holiday.be-BY11.date=20150101
 holiday.be-BY12.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY12.date=20130107
+holiday.be-BY12.date=20150107
 holiday.be-BY13.name=Міжнародны жаночы дзень
-holiday.be-BY13.date=20130803
+holiday.be-BY13.date=20150803
 holiday.be-BY14.name=Пасха(праваслаўная)
-holiday.be-BY14.date=20130505
+holiday.be-BY14.date=20150420
 holiday.be-BY15.name=Радуніца
-holiday.be-BY15.date=20130514
+holiday.be-BY15.date=20150421
 holiday.be-BY16.name=Свята працы
-holiday.be-BY16.date=20130501
+holiday.be-BY16.date=20150501
 holiday.be-BY17.name=Дзень Перамогі
-holiday.be-BY17.date=20130509
+holiday.be-BY17.date=20150509
 holiday.be-BY18.name=Дзень незалежнаці
-holiday.be-BY18.date=20130703
+holiday.be-BY18.date=20150703
 holiday.be-BY19.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY19.date=20131107
+holiday.be-BY19.date=20151107
 holiday.be-BY20.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY20.date=20131225
+holiday.be-BY20.date=20151225
+holiday.be-BY21.name=Новы Год
+holiday.be-BY21.date=20160101
+holiday.be-BY22.name=Раство Хрыстова(праваслаўнае)
+holiday.be-BY22.date=20160107
+holiday.be-BY23.name=Міжнародны жаночы дзень
+holiday.be-BY23.date=20160803
+holiday.be-BY24.name=Пасха(праваслаўная)
+holiday.be-BY24.date=20160327
+holiday.be-BY25.name=Радуніца
+holiday.be-BY25.date=20160510
+holiday.be-BY26.name=Свята працы
+holiday.be-BY26.date=20160501
+holiday.be-BY27.name=Дзень Перамогі
+holiday.be-BY27.date=20160509
+holiday.be-BY28.name=Дзень незалежнаці
+holiday.be-BY28.date=20160703
+holiday.be-BY29.name=Дзень Кастрычніцкай рэвалюцыі
+holiday.be-BY29.date=20161107
+holiday.be-BY30.name=Раство Хрыстова(у заходніх хрысціян)
+holiday.be-BY30.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/2012.json
-# http://holidata.net/cs-CZ/2013.json
+# http://holidata.net/cs-CZ/2014.json
+# http://holidata.net/cs-CZ/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,54 +28,80 @@
 ###############################################################################

 holiday.cs-CZ1.name=Nový rok
-holiday.cs-CZ1.date=20120101
+holiday.cs-CZ1.date=20140101
 holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ2.date=20120101
+holiday.cs-CZ2.date=20140101
 holiday.cs-CZ3.name=Velikonoční pondělí
-holiday.cs-CZ3.date=20120409
+holiday.cs-CZ3.date=20140421
 holiday.cs-CZ4.name=Svátek práce
-holiday.cs-CZ4.date=20120501
+holiday.cs-CZ4.date=20140501
 holiday.cs-CZ5.name=Den vítězství
-holiday.cs-CZ5.date=20120508
+holiday.cs-CZ5.date=20140508
 holiday.cs-CZ6.name=Den slovanských věrozvěstů
-holiday.cs-CZ6.date=20120705
+holiday.cs-CZ6.date=20140705
 holiday.cs-CZ7.name=Den upálení mistra Jana Husa
-holiday.cs-CZ7.date=20120706
+holiday.cs-CZ7.date=20140706
 holiday.cs-CZ8.name=Den české státnosti
-holiday.cs-CZ8.date=20120928
+holiday.cs-CZ8.date=20140928
 holiday.cs-CZ9.name=Den vzniku samostatného československého státu
-holiday.cs-CZ9.date=20121028
+holiday.cs-CZ9.date=20141028
 holiday.cs-CZ10.name=Den boje za svobodu a demokracii
-holiday.cs-CZ10.date=20121117
+holiday.cs-CZ10.date=20141117
 holiday.cs-CZ11.name=Štědrý den
-holiday.cs-CZ11.date=20121224
+holiday.cs-CZ11.date=20141224
 holiday.cs-CZ12.name=1. svátek vánoční
-holiday.cs-CZ12.date=20121225
+holiday.cs-CZ12.date=20141225
 holiday.cs-CZ13.name=2. svátek vánoční
-holiday.cs-CZ13.date=20121226
+holiday.cs-CZ13.date=20141226
 holiday.cs-CZ14.name=Nový rok
-holiday.cs-CZ14.date=20130101
+holiday.cs-CZ14.date=20150101
 holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ15.date=20130101
+holiday.cs-CZ15.date=20150101
 holiday.cs-CZ16.name=Velikonoční pondělí
-holiday.cs-CZ16.date=20130401
+holiday.cs-CZ16.date=20150406
 holiday.cs-CZ17.name=Svátek práce
-holiday.cs-CZ17.date=20130501
+holiday.cs-CZ17.date=20150501
 holiday.cs-CZ18.name=Den vítězství
-holiday.cs-CZ18.date=20130508
+holiday.cs-CZ18.date=20150508
 holiday.cs-CZ19.name=Den slovanských věrozvěstů
-holiday.cs-CZ19.date=20130705
+holiday.cs-CZ19.date=20150705
 holiday.cs-CZ20.name=Den upálení mistra Jana Husa
-holiday.cs-CZ20.date=20130706
+holiday.cs-CZ20.date=20150706
 holiday.cs-CZ21.name=Den české státnosti
-holiday.cs-CZ21.date=20130928
+holiday.cs-CZ21.date=20150928
 holiday.cs-CZ22.name=Den vzniku samostatného československého státu
-holiday.cs-CZ22.date=20131028
+holiday.cs-CZ22.date=20151028
 holiday.cs-CZ23.name=Den boje za svobodu a demokracii
-holiday.cs-CZ23.date=20131117
+holiday.cs-CZ23.date=20151117
 holiday.cs-CZ24.name=Štědrý den
-holiday.cs-CZ24.date=20131224
+holiday.cs-CZ24.date=20151224
 holiday.cs-CZ25.name=1. svátek vánoční
-holiday.cs-CZ25.date=20131225
+holiday.cs-CZ25.date=20151225
 holiday.cs-CZ26.name=2. svátek vánoční
-holiday.cs-CZ26.date=20131226
+holiday.cs-CZ26.date=20151226
+holiday.cs-CZ27.name=Nový rok
+holiday.cs-CZ27.date=20160101
+holiday.cs-CZ28.name=Den obnovy samostatnosti českého státu
+holiday.cs-CZ28.date=20160101
+holiday.cs-CZ29.name=Velikonoční pondělí
+holiday.cs-CZ29.date=20160328
+holiday.cs-CZ30.name=Svátek práce
+holiday.cs-CZ30.date=20160501
+holiday.cs-CZ31.name=Den vítězství
+holiday.cs-CZ31.date=20160508
+holiday.cs-CZ32.name=Den slovanských věrozvěstů
+holiday.cs-CZ32.date=20160705
+holiday.cs-CZ33.name=Den upálení mistra Jana Husa
+holiday.cs-CZ33.date=20160706
+holiday.cs-CZ34.name=Den české státnosti
+holiday.cs-CZ34.date=20160928
+holiday.cs-CZ35.name=Den vzniku samostatného československého státu
+holiday.cs-CZ35.date=20161028
+holiday.cs-CZ36.name=Den boje za svobodu a demokracii
+holiday.cs-CZ36.date=20161117
+holiday.cs-CZ37.name=Štědrý den
+holiday.cs-CZ37.date=20161224
+holiday.cs-CZ38.name=1. svátek vánoční
+holiday.cs-CZ38.date=20161225
+holiday.cs-CZ39.name=2. svátek vánoční
+holiday.cs-CZ39.date=20161226
--- 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/2012.json
-# http://holidata.net/da-DK/2013.json
+# http://holidata.net/da-DK/2014.json
+# http://holidata.net/da-DK/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,51 +27,69 @@
 #
 ###############################################################################

-holiday.da-DK1.name=Nytårsdag
-holiday.da-DK1.date=20120101
-holiday.da-DK2.name=Palmesøndag
-holiday.da-DK2.date=20120401
+holiday.da-DK1.name=Grundlovsdag
+holiday.da-DK1.date=20140605
+holiday.da-DK2.name=Nytårsdag
+holiday.da-DK2.date=20140101
 holiday.da-DK3.name=Skærtorsdag
-holiday.da-DK3.date=20120405
+holiday.da-DK3.date=20140417
 holiday.da-DK4.name=Langfredag
-holiday.da-DK4.date=20120406
+holiday.da-DK4.date=20140418
 holiday.da-DK5.name=Påskedag
-holiday.da-DK5.date=20120408
+holiday.da-DK5.date=20140420
 holiday.da-DK6.name=Anden påskedag
-holiday.da-DK6.date=20120409
-holiday.da-DK7.name=Store bededag
-holiday.da-DK7.date=20120504
-holiday.da-DK8.name=Kristi himmelfartsdag
-holiday.da-DK8.date=20120517
-holiday.da-DK9.name=Pinsedag
-holiday.da-DK9.date=20120527
-holiday.da-DK10.name=Anden pinsedag
-holiday.da-DK10.date=20120528
-holiday.da-DK11.name=Juledag
-holiday.da-DK11.date=20121225
-holiday.da-DK12.name=Anden juledag
-holiday.da-DK12.date=20121226
-holiday.da-DK13.name=Nytårsdag
-holiday.da-DK13.date=20130101
-holiday.da-DK14.name=Palmesøndag
-holiday.da-DK14.date=20130324
-holiday.da-DK15.name=Skærtorsdag
-holiday.da-DK15.date=20130328
-holiday.da-DK16.name=Langfredag
-holiday.da-DK16.date=20130329
-holiday.da-DK17.name=Påskedag
-holiday.da-DK17.date=20130331
-holiday.da-DK18.name=Anden påskedag
-holiday.da-DK18.date=20130401
-holiday.da-DK19.name=Store bededag
-holiday.da-DK19.date=20130426
-holiday.da-DK20.name=Kristi himmelfartsdag
-holiday.da-DK20.date=20130509
-holiday.da-DK21.name=Pinsedag
-holiday.da-DK21.date=20130519
-holiday.da-DK22.name=Anden pinsedag
-holiday.da-DK22.date=20130520
-holiday.da-DK23.name=Juledag
-holiday.da-DK23.date=20131225
-holiday.da-DK24.name=Anden juledag
-holiday.da-DK24.date=20131226
+holiday.da-DK6.date=20140421
+holiday.da-DK7.name=Kristi himmelfartsdag
+holiday.da-DK7.date=20140529
+holiday.da-DK8.name=Pinsedag
+holiday.da-DK8.date=20140608
+holiday.da-DK9.name=Anden pinsedag
+holiday.da-DK9.date=20140609
+holiday.da-DK10.name=Juledag
+holiday.da-DK10.date=20141225
+holiday.da-DK11.name=Anden juledag
+holiday.da-DK11.date=20141226
+holiday.da-DK12.name=Nytårsdag
+holiday.da-DK12.date=20150101
+holiday.da-DK13.name=Skærtorsdag
+holiday.da-DK13.date=20150402
+holiday.da-DK14.name=Langfredag
+holiday.da-DK14.date=20150403
+holiday.da-DK15.name=Påskedag
+holiday.da-DK15.date=20150405
+holiday.da-DK16.name=Anden påskedag
+holiday.da-DK16.date=20150406
+holiday.da-DK17.name=Kristi himmelfartsdag
+holiday.da-DK17.date=20150514
+holiday.da-DK18.name=Pinsedag
+holiday.da-DK18.date=20150524
+holiday.da-DK19.name=Anden pinsedag
+holiday.da-DK19.date=20150525
+holiday.da-DK20.name=Grundlovsdag
+holiday.da-DK20.date=20150605
+holiday.da-DK21.name=Juledag
+holiday.da-DK21.date=20151225
+holiday.da-DK22.name=Anden juledag
+holiday.da-DK22.date=20151226
+holiday.da-DK23.name=Nytårsdag
+holiday.da-DK23.date=20160101
+holiday.da-DK24.name=Skærtorsdag
+holiday.da-DK24.date=20160324
+holiday.da-DK25.name=Langfredag
+holiday.da-DK25.date=20160325
+holiday.da-DK26.name=Påskedag
+holiday.da-DK26.date=20160327
+holiday.da-DK27.name=Anden påskedag
+holiday.da-DK27.date=20160328
+holiday.da-DK28.name=Kristi himmelfartsdag
+holiday.da-DK28.date=20160505
+holiday.da-DK29.name=Pinsedag
+holiday.da-DK29.date=20160515
+holiday.da-DK30.name=Anden pinsedag
+holiday.da-DK30.date=20160516
+holiday.da-DK31.name=Grundlovsdag
+holiday.da-DK31.date=20160605
+holiday.da-DK32.name=Juledag
+holiday.da-DK32.date=20161225
+holiday.da-DK33.name=Anden juledag
+holiday.da-DK33.date=20161226
--- 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/2012.json
-# http://holidata.net/de-AT/2013.json
+# http://holidata.net/de-AT/2014.json
+# http://holidata.net/de-AT/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,94 +28,140 @@
 ###############################################################################

 holiday.de-AT1.name=Neujahr
-holiday.de-AT1.date=20120101
+holiday.de-AT1.date=20140101
 holiday.de-AT2.name=Heilige drei KÃ¶nige
-holiday.de-AT2.date=20120106
+holiday.de-AT2.date=20140106
 holiday.de-AT3.name=Josef (K, St, T, V)
-holiday.de-AT3.date=20120319
+holiday.de-AT3.date=20140319
 holiday.de-AT4.name=Karfreitag
-holiday.de-AT4.date=20120406
+holiday.de-AT4.date=20140418
 holiday.de-AT5.name=Ostersonntag
-holiday.de-AT5.date=20120408
+holiday.de-AT5.date=20140420
 holiday.de-AT6.name=Ostermontag
-holiday.de-AT6.date=20120409
+holiday.de-AT6.date=20140421
 holiday.de-AT7.name=Staatsfeiertag
-holiday.de-AT7.date=20120501
+holiday.de-AT7.date=20140501
 holiday.de-AT8.name=Florian (O)
-holiday.de-AT8.date=20120504
+holiday.de-AT8.date=20140504
 holiday.de-AT9.name=Christi Himmelfahrt
-holiday.de-AT9.date=20120517
+holiday.de-AT9.date=20140529
 holiday.de-AT10.name=Pfingstsonntag
-holiday.de-AT10.date=20120527
+holiday.de-AT10.date=20140608
 holiday.de-AT11.name=Pfingstmontag
-holiday.de-AT11.date=20120528
+holiday.de-AT11.date=20140609
 holiday.de-AT12.name=Fronleichnam
-holiday.de-AT12.date=20120607
+holiday.de-AT12.date=20140619
 holiday.de-AT13.name=Mariä Himmelfahrt
-holiday.de-AT13.date=20120815
+holiday.de-AT13.date=20140815
 holiday.de-AT14.name=Rupert (S)
-holiday.de-AT14.date=20120924
+holiday.de-AT14.date=20140924
 holiday.de-AT15.name=Tag der Volksabstimmung (K)
-holiday.de-AT15.date=20121010
+holiday.de-AT15.date=20141010
 holiday.de-AT16.name=Allerheiligen
-holiday.de-AT16.date=20121101
+holiday.de-AT16.date=20141101
 holiday.de-AT17.name=Martin (B)
-holiday.de-AT17.date=20121111
+holiday.de-AT17.date=20141111
 holiday.de-AT18.name=Leopold (W, N)
-holiday.de-AT18.date=20121115
+holiday.de-AT18.date=20141115
 holiday.de-AT19.name=Mariä Empfängnis
-holiday.de-AT19.date=20121208
+holiday.de-AT19.date=20141208
 holiday.de-AT20.name=Heiliger Abend
-holiday.de-AT20.date=20121224
+holiday.de-AT20.date=20141224
 holiday.de-AT21.name=Christtag
-holiday.de-AT21.date=20121225
+holiday.de-AT21.date=20141225
 holiday.de-AT22.name=Stefanitag
-holiday.de-AT22.date=20121226
+holiday.de-AT22.date=20141226
 holiday.de-AT23.name=Silvester
-holiday.de-AT23.date=20121231
+holiday.de-AT23.date=20141231
 holiday.de-AT24.name=Neujahr
-holiday.de-AT24.date=20130101
+holiday.de-AT24.date=20150101
 holiday.de-AT25.name=Heilige drei KÃ¶nige
-holiday.de-AT25.date=20130106
+holiday.de-AT25.date=20150106
 holiday.de-AT26.name=Josef (K, St, T, V)
-holiday.de-AT26.date=20130319
+holiday.de-AT26.date=20150319
 holiday.de-AT27.name=Karfreitag
-holiday.de-AT27.date=20130329
+holiday.de-AT27.date=20150403
 holiday.de-AT28.name=Ostersonntag
-holiday.de-AT28.date=20130331
+holiday.de-AT28.date=20150405
 holiday.de-AT29.name=Ostermontag
-holiday.de-AT29.date=20130401
+holiday.de-AT29.date=20150406
 holiday.de-AT30.name=Staatsfeiertag
-holiday.de-AT30.date=20130501
+holiday.de-AT30.date=20150501
 holiday.de-AT31.name=Florian (O)
-holiday.de-AT31.date=20130504
+holiday.de-AT31.date=20150504
 holiday.de-AT32.name=Christi Himmelfahrt
-holiday.de-AT32.date=20130509
+holiday.de-AT32.date=20150514
 holiday.de-AT33.name=Pfingstsonntag
-holiday.de-AT33.date=20130519
+holiday.de-AT33.date=20150524
 holiday.de-AT34.name=Pfingstmontag
-holiday.de-AT34.date=20130520
+holiday.de-AT34.date=20150525
 holiday.de-AT35.name=Fronleichnam
-holiday.de-AT35.date=20130530
+holiday.de-AT35.date=20150604
 holiday.de-AT36.name=Mariä Himmelfahrt
-holiday.de-AT36.date=20130815
+holiday.de-AT36.date=20150815
 holiday.de-AT37.name=Rupert (S)
-holiday.de-AT37.date=20130924
+holiday.de-AT37.date=20150924
 holiday.de-AT38.name=Tag der Volksabstimmung (K)
-holiday.de-AT38.date=20131010
+holiday.de-AT38.date=20151010
 holiday.de-AT39.name=Allerheiligen
-holiday.de-AT39.date=20131101
+holiday.de-AT39.date=20151101
 holiday.de-AT40.name=Martin (B)
-holiday.de-AT40.date=20131111
+holiday.de-AT40.date=20151111
 holiday.de-AT41.name=Leopold (W, N)
-holiday.de-AT41.date=20131115
+holiday.de-AT41.date=20151115
 holiday.de-AT42.name=Mariä Empfängnis
-holiday.de-AT42.date=20131208
+holiday.de-AT42.date=20151208
 holiday.de-AT43.name=Heiliger Abend
-holiday.de-AT43.date=20131224
+holiday.de-AT43.date=20151224
 holiday.de-AT44.name=Christtag
-holiday.de-AT44.date=20131225
+holiday.de-AT44.date=20151225
 holiday.de-AT45.name=Stefanitag
-holiday.de-AT45.date=20131226
+holiday.de-AT45.date=20151226
 holiday.de-AT46.name=Silvester
-holiday.de-AT46.date=20131231
+holiday.de-AT46.date=20151231
+holiday.de-AT47.name=Neujahr
+holiday.de-AT47.date=20160101
+holiday.de-AT48.name=Heilige drei KÃ¶nige
+holiday.de-AT48.date=20160106
+holiday.de-AT49.name=Josef (K, St, T, V)
+holiday.de-AT49.date=20160319
+holiday.de-AT50.name=Karfreitag
+holiday.de-AT50.date=20160325
+holiday.de-AT51.name=Ostersonntag
+holiday.de-AT51.date=20160327
+holiday.de-AT52.name=Ostermontag
+holiday.de-AT52.date=20160328
+holiday.de-AT53.name=Staatsfeiertag
+holiday.de-AT53.date=20160501
+holiday.de-AT54.name=Florian (O)
+holiday.de-AT54.date=20160504
+holiday.de-AT55.name=Christi Himmelfahrt
+holiday.de-AT55.date=20160505
+holiday.de-AT56.name=Pfingstsonntag
+holiday.de-AT56.date=20160515
+holiday.de-AT57.name=Pfingstmontag
+holiday.de-AT57.date=20160516
+holiday.de-AT58.name=Fronleichnam
+holiday.de-AT58.date=20160526
+holiday.de-AT59.name=Mariä Himmelfahrt
+holiday.de-AT59.date=20160815
+holiday.de-AT60.name=Rupert (S)
+holiday.de-AT60.date=20160924
+holiday.de-AT61.name=Tag der Volksabstimmung (K)
+holiday.de-AT61.date=20161010
+holiday.de-AT62.name=Allerheiligen
+holiday.de-AT62.date=20161101
+holiday.de-AT63.name=Martin (B)
+holiday.de-AT63.date=20161111
+holiday.de-AT64.name=Leopold (W, N)
+holiday.de-AT64.date=20161115
+holiday.de-AT65.name=Mariä Empfängnis
+holiday.de-AT65.date=20161208
+holiday.de-AT66.name=Heiliger Abend
+holiday.de-AT66.date=20161224
+holiday.de-AT67.name=Christtag
+holiday.de-AT67.date=20161225
+holiday.de-AT68.name=Stefanitag
+holiday.de-AT68.date=20161226
+holiday.de-AT69.name=Silvester
+holiday.de-AT69.date=20161231
--- a/doc/rc/holidays.de-BE.rc
+++ b/doc/rc/holidays.de-BE.rc
@@ -0,0 +1,101 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/de-BE/2014.json
+# http://holidata.net/de-BE/2015.json
+#
+# Copyright 2006 - 2015, 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.de-BE1.name=Neujahr
+holiday.de-BE1.date=20140101
+holiday.de-BE2.name=Ostern
+holiday.de-BE2.date=20140420
+holiday.de-BE3.name=Ostermontag
+holiday.de-BE3.date=20140421
+holiday.de-BE4.name=Tag der Arbeit
+holiday.de-BE4.date=20140501
+holiday.de-BE5.name=Christi Himmelfahrt
+holiday.de-BE5.date=20140529
+holiday.de-BE6.name=Pfingsten
+holiday.de-BE6.date=20140608
+holiday.de-BE7.name=Pfingstmontag
+holiday.de-BE7.date=20140609
+holiday.de-BE8.name=Nationalfeiertag
+holiday.de-BE8.date=20140721
+holiday.de-BE9.name=Mariä Himmelfahrt
+holiday.de-BE9.date=20140815
+holiday.de-BE10.name=Allerheiligen
+holiday.de-BE10.date=20141101
+holiday.de-BE11.name=Waffenstillstand
+holiday.de-BE11.date=20141111
+holiday.de-BE12.name=Weihnacht
+holiday.de-BE12.date=20141225
+holiday.de-BE13.name=Neujahr
+holiday.de-BE13.date=20150101
+holiday.de-BE14.name=Ostern
+holiday.de-BE14.date=20150405
+holiday.de-BE15.name=Ostermontag
+holiday.de-BE15.date=20150406
+holiday.de-BE16.name=Tag der Arbeit
+holiday.de-BE16.date=20150501
+holiday.de-BE17.name=Christi Himmelfahrt
+holiday.de-BE17.date=20150514
+holiday.de-BE18.name=Pfingsten
+holiday.de-BE18.date=20150524
+holiday.de-BE19.name=Pfingstmontag
+holiday.de-BE19.date=20150525
+holiday.de-BE20.name=Nationalfeiertag
+holiday.de-BE20.date=20150721
+holiday.de-BE21.name=Mariä Himmelfahrt
+holiday.de-BE21.date=20150815
+holiday.de-BE22.name=Allerheiligen
+holiday.de-BE22.date=20151101
+holiday.de-BE23.name=Waffenstillstand
+holiday.de-BE23.date=20151111
+holiday.de-BE24.name=Weihnacht
+holiday.de-BE24.date=20151225
+holiday.de-BE25.name=Neujahr
+holiday.de-BE25.date=20160101
+holiday.de-BE26.name=Ostern
+holiday.de-BE26.date=20160527
+holiday.de-BE27.name=Ostermontag
+holiday.de-BE27.date=20160528
+holiday.de-BE28.name=Tag der Arbeit
+holiday.de-BE28.date=20160501
+holiday.de-BE29.name=Christi Himmelfahrt
+holiday.de-BE29.date=20160505
+holiday.de-BE30.name=Pfingsten
+holiday.de-BE30.date=20160515
+holiday.de-BE31.name=Pfingstmontag
+holiday.de-BE31.date=20160516
+holiday.de-BE32.name=Nationalfeiertag
+holiday.de-BE32.date=20160721
+holiday.de-BE33.name=Mariä Himmelfahrt
+holiday.de-BE33.date=20160815
+holiday.de-BE34.name=Allerheiligen
+holiday.de-BE34.date=20161101
+holiday.de-BE35.name=Waffenstillstand
+holiday.de-BE35.date=20161111
+holiday.de-BE36.name=Weihnacht
+holiday.de-BE36.date=20161225
--- a/doc/rc/holidays.de-CH.rc
+++ b/doc/rc/holidays.de-CH.rc
@@ -0,0 +1,137 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/de-CH/2014.json
+# http://holidata.net/de-CH/2015.json
+#
+# Copyright 2006 - 2014, 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.de-CH1.name=Neujahrstag
+holiday.de-CH1.date=20140101
+holiday.de-CH2.name=Berchtoldstag
+holiday.de-CH2.date=20140102
+holiday.de-CH3.name=Heilige Drei Könige
+holiday.de-CH3.date=20140106
+holiday.de-CH4.name=Josefstag
+holiday.de-CH4.date=20140319
+holiday.de-CH5.name=Karfreitag
+holiday.de-CH5.date=20140418
+holiday.de-CH6.name=Ostersonntag
+holiday.de-CH6.date=20140420
+holiday.de-CH7.name=Ostermontag
+holiday.de-CH7.date=20140421
+holiday.de-CH8.name=Tag der Arbeit
+holiday.de-CH8.date=20140501
+holiday.de-CH9.name=Auffahrt
+holiday.de-CH9.date=20140529
+holiday.de-CH10.name=Pfingstsonntag
+holiday.de-CH10.date=20140608
+holiday.de-CH11.name=Pfingstmontag
+holiday.de-CH11.date=20140609
+holiday.de-CH12.name=Fronleichnam
+holiday.de-CH12.date=20140619
+holiday.de-CH13.name=Bundesfeier
+holiday.de-CH13.date=20140801
+holiday.de-CH14.name=Mariä Himmelfahrt
+holiday.de-CH14.date=20140815
+holiday.de-CH15.name=Allerheiligen
+holiday.de-CH15.date=20141101
+holiday.de-CH16.name=Mariä Empfängnis
+holiday.de-CH16.date=20141208
+holiday.de-CH17.name=Weihnachtstag
+holiday.de-CH17.date=20141225
+holiday.de-CH18.name=Stephanstag
+holiday.de-CH18.date=20141226
+holiday.de-CH19.name=Neujahrstag
+holiday.de-CH19.date=20150101
+holiday.de-CH20.name=Berchtoldstag
+holiday.de-CH20.date=20150102
+holiday.de-CH21.name=Heilige Drei Könige
+holiday.de-CH21.date=20150106
+holiday.de-CH22.name=Josefstag
+holiday.de-CH22.date=20150319
+holiday.de-CH23.name=Karfreitag
+holiday.de-CH23.date=20150403
+holiday.de-CH24.name=Ostersonntag
+holiday.de-CH24.date=20150405
+holiday.de-CH25.name=Ostermontag
+holiday.de-CH25.date=20150406
+holiday.de-CH26.name=Tag der Arbeit
+holiday.de-CH26.date=20150501
+holiday.de-CH27.name=Auffahrt
+holiday.de-CH27.date=20150514
+holiday.de-CH28.name=Pfingstsonntag
+holiday.de-CH28.date=20150524
+holiday.de-CH29.name=Pfingstmontag
+holiday.de-CH29.date=20150525
+holiday.de-CH30.name=Fronleichnam
+holiday.de-CH30.date=20150604
+holiday.de-CH31.name=Bundesfeier
+holiday.de-CH31.date=20150801
+holiday.de-CH32.name=Mariä Himmelfahrt
+holiday.de-CH32.date=20150815
+holiday.de-CH33.name=Allerheiligen
+holiday.de-CH33.date=20151101
+holiday.de-CH34.name=Mariä Empfängnis
+holiday.de-CH34.date=20151208
+holiday.de-CH35.name=Weihnachtstag
+holiday.de-CH35.date=20151225
+holiday.de-CH36.name=Stephanstag
+holiday.de-CH36.date=20151226
+holiday.de-CH37.name=Neujahrstag
+holiday.de-CH37.date=20160101
+holiday.de-CH38.name=Berchtoldstag
+holiday.de-CH38.date=20160102
+holiday.de-CH39.name=Heilige Drei Könige
+holiday.de-CH39.date=20160106
+holiday.de-CH40.name=Josefstag
+holiday.de-CH40.date=20160319
+holiday.de-CH41.name=Karfreitag
+holiday.de-CH41.date=20160325
+holiday.de-CH42.name=Ostersonntag
+holiday.de-CH42.date=20160327
+holiday.de-CH43.name=Ostermontag
+holiday.de-CH43.date=20160328
+holiday.de-CH44.name=Tag der Arbeit
+holiday.de-CH44.date=20160501
+holiday.de-CH45.name=Auffahrt
+holiday.de-CH45.date=20160505
+holiday.de-CH46.name=Pfingstsonntag
+holiday.de-CH46.date=20160515
+holiday.de-CH47.name=Pfingstmontag
+holiday.de-CH47.date=20160516
+holiday.de-CH48.name=Fronleichnam
+holiday.de-CH48.date=20160526
+holiday.de-CH49.name=Bundesfeier
+holiday.de-CH49.date=20160801
+holiday.de-CH50.name=Mariä Himmelfahrt
+holiday.de-CH50.date=20160815
+holiday.de-CH51.name=Allerheiligen
+holiday.de-CH51.date=20161101
+holiday.de-CH52.name=Mariä Empfängnis
+holiday.de-CH52.date=20161208
+holiday.de-CH53.name=Weihnachtstag
+holiday.de-CH53.date=20161225
+holiday.de-CH54.name=Stephanstag
+holiday.de-CH54.date=20161226
--- a/doc/rc/holidays.de-DE.rc
+++ b/doc/rc/holidays.de-DE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/de-DE/2012.json
-# http://holidata.net/de-DE/2013.json
+# http://holidata.net/de-DE/2014.json
+# http://holidata.net/de-DE/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2014, 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
@@ -28,138 +28,116 @@
 ###############################################################################

 holiday.de-DE1.name=Neujahr
-holiday.de-DE1.date=20120101
+holiday.de-DE1.date=20140101
 holiday.de-DE2.name=Heilige drei Könige
-holiday.de-DE2.date=20120106
-holiday.de-DE3.name=Heilige drei Könige
-holiday.de-DE3.date=20120106
-holiday.de-DE4.name=Heilige drei Könige
-holiday.de-DE4.date=20120106
-holiday.de-DE5.name=Karfreitag
-holiday.de-DE5.date=20120406
-holiday.de-DE6.name=Ostern
-holiday.de-DE6.date=20120408
-holiday.de-DE7.name=Ostermontag
-holiday.de-DE7.date=20120409
-holiday.de-DE8.name=Erster Maifeiertag
-holiday.de-DE8.date=20120501
-holiday.de-DE9.name=Christi Himmelfahrt
-holiday.de-DE9.date=20120517
-holiday.de-DE10.name=Pfingstsonntag
-holiday.de-DE10.date=20120527
-holiday.de-DE11.name=Pfingstmontag
-holiday.de-DE11.date=20120528
-holiday.de-DE12.name=Fronleichnam
-holiday.de-DE12.date=20120607
-holiday.de-DE13.name=Fronleichnam
-holiday.de-DE13.date=20120607
-holiday.de-DE14.name=Fronleichnam
-holiday.de-DE14.date=20120607
-holiday.de-DE15.name=Fronleichnam
-holiday.de-DE15.date=20120607
-holiday.de-DE16.name=Fronleichnam
-holiday.de-DE16.date=20120607
-holiday.de-DE17.name=Fronleichnam
-holiday.de-DE17.date=20120607
-holiday.de-DE18.name=Mariä Himmelfahrt
-holiday.de-DE18.date=20120815
-holiday.de-DE19.name=Tag der Deutschen Einheit
-holiday.de-DE19.date=20121003
-holiday.de-DE20.name=Reformationstag
-holiday.de-DE20.date=20121031
-holiday.de-DE21.name=Reformationstag
-holiday.de-DE21.date=20121031
-holiday.de-DE22.name=Reformationstag
-holiday.de-DE22.date=20121031
-holiday.de-DE23.name=Reformationstag
-holiday.de-DE23.date=20121031
-holiday.de-DE24.name=Reformationstag
-holiday.de-DE24.date=20121031
-holiday.de-DE25.name=Allerheiligen
-holiday.de-DE25.date=20121101
-holiday.de-DE26.name=Allerheiligen
-holiday.de-DE26.date=20121101
-holiday.de-DE27.name=Allerheiligen
-holiday.de-DE27.date=20121101
-holiday.de-DE28.name=Allerheiligen
-holiday.de-DE28.date=20121101
-holiday.de-DE29.name=Allerheiligen
-holiday.de-DE29.date=20121101
-holiday.de-DE30.name=Buss und Bettag
-holiday.de-DE30.date=20121121
-holiday.de-DE31.name=Heilig Abend
-holiday.de-DE31.date=20121224
-holiday.de-DE32.name=Weihnachtstag
-holiday.de-DE32.date=20121225
-holiday.de-DE33.name=Zweiter Weihnachtstag
-holiday.de-DE33.date=20121226
-holiday.de-DE34.name=Sylvester
-holiday.de-DE34.date=20121231
-holiday.de-DE35.name=Neujahr
-holiday.de-DE35.date=20130101
-holiday.de-DE36.name=Heilige drei Könige
-holiday.de-DE36.date=20130106
-holiday.de-DE37.name=Heilige drei Könige
-holiday.de-DE37.date=20130106
-holiday.de-DE38.name=Heilige drei Könige
-holiday.de-DE38.date=20130106
-holiday.de-DE39.name=Karfreitag
-holiday.de-DE39.date=20130329
-holiday.de-DE40.name=Ostern
-holiday.de-DE40.date=20130331
-holiday.de-DE41.name=Ostermontag
-holiday.de-DE41.date=20130401
-holiday.de-DE42.name=Erster Maifeiertag
-holiday.de-DE42.date=20130501
-holiday.de-DE43.name=Christi Himmelfahrt
-holiday.de-DE43.date=20130509
-holiday.de-DE44.name=Pfingstsonntag
-holiday.de-DE44.date=20130519
-holiday.de-DE45.name=Pfingstmontag
-holiday.de-DE45.date=20130520
-holiday.de-DE46.name=Fronleichnam
-holiday.de-DE46.date=20130530
-holiday.de-DE47.name=Fronleichnam
-holiday.de-DE47.date=20130530
+holiday.de-DE2.date=20140106
+holiday.de-DE3.name=Karfreitag
+holiday.de-DE3.date=20140418
+holiday.de-DE4.name=Ostern
+holiday.de-DE4.date=20140420
+holiday.de-DE5.name=Ostermontag
+holiday.de-DE5.date=20140421
+holiday.de-DE6.name=Erster Maifeiertag
+holiday.de-DE6.date=20140501
+holiday.de-DE7.name=Christi Himmelfahrt
+holiday.de-DE7.date=20140529
+holiday.de-DE8.name=Pfingstsonntag
+holiday.de-DE8.date=20140608
+holiday.de-DE9.name=Pfingstmontag
+holiday.de-DE9.date=20140609
+holiday.de-DE10.name=Fronleichnam
+holiday.de-DE10.date=20140619
+holiday.de-DE11.name=Mariä Himmelfahrt
+holiday.de-DE11.date=20140815
+holiday.de-DE12.name=Tag der Deutschen Einheit
+holiday.de-DE12.date=20141003
+holiday.de-DE13.name=Reformationstag
+holiday.de-DE13.date=20141031
+holiday.de-DE14.name=Allerheiligen
+holiday.de-DE14.date=20141101
+holiday.de-DE15.name=Buss und Bettag
+holiday.de-DE15.date=20141119
+holiday.de-DE16.name=Heilig Abend
+holiday.de-DE16.date=20141224
+holiday.de-DE17.name=Weihnachtstag
+holiday.de-DE17.date=20141225
+holiday.de-DE18.name=Zweiter Weihnachtstag
+holiday.de-DE18.date=20141226
+holiday.de-DE19.name=Sylvester
+holiday.de-DE19.date=20141231
+holiday.de-DE20.name=Neujahr
+holiday.de-DE20.date=20150101
+holiday.de-DE21.name=Heilige drei Könige
+holiday.de-DE21.date=20150106
+holiday.de-DE22.name=Karfreitag
+holiday.de-DE22.date=20150403
+holiday.de-DE23.name=Ostern
+holiday.de-DE23.date=20150405
+holiday.de-DE24.name=Ostermontag
+holiday.de-DE24.date=20150406
+holiday.de-DE25.name=Erster Maifeiertag
+holiday.de-DE25.date=20150501
+holiday.de-DE26.name=Christi Himmelfahrt
+holiday.de-DE26.date=20150514
+holiday.de-DE27.name=Pfingstsonntag
+holiday.de-DE27.date=20150524
+holiday.de-DE28.name=Pfingstmontag
+holiday.de-DE28.date=20150525
+holiday.de-DE29.name=Fronleichnam
+holiday.de-DE29.date=20150604
+holiday.de-DE30.name=Mariä Himmelfahrt
+holiday.de-DE30.date=20150815
+holiday.de-DE31.name=Tag der Deutschen Einheit
+holiday.de-DE31.date=20151003
+holiday.de-DE32.name=Reformationstag
+holiday.de-DE32.date=20151031
+holiday.de-DE33.name=Allerheiligen
+holiday.de-DE33.date=20151101
+holiday.de-DE34.name=Buss und Bettag
+holiday.de-DE34.date=20151118
+holiday.de-DE35.name=Heilig Abend
+holiday.de-DE35.date=20151224
+holiday.de-DE36.name=Weihnachtstag
+holiday.de-DE36.date=20151225
+holiday.de-DE37.name=Zweiter Weihnachtstag
+holiday.de-DE37.date=20151226
+holiday.de-DE38.name=Sylvester
+holiday.de-DE38.date=20151231
+holiday.de-DE39.name=Neujahr
+holiday.de-DE39.date=20160101
+holiday.de-DE40.name=Heilige drei Könige
+holiday.de-DE40.date=20160106
+holiday.de-DE41.name=Karfreitag
+holiday.de-DE41.date=20160325
+holiday.de-DE42.name=Ostern
+holiday.de-DE42.date=20160327
+holiday.de-DE43.name=Ostermontag
+holiday.de-DE43.date=20160328
+holiday.de-DE44.name=Erster Maifeiertag
+holiday.de-DE44.date=20160501
+holiday.de-DE45.name=Christi Himmelfahrt
+holiday.de-DE45.date=20160505
+holiday.de-DE46.name=Pfingstsonntag
+holiday.de-DE46.date=20160515
+holiday.de-DE47.name=Pfingstmontag
+holiday.de-DE47.date=20160516
 holiday.de-DE48.name=Fronleichnam
-holiday.de-DE48.date=20130530
-holiday.de-DE49.name=Fronleichnam
-holiday.de-DE49.date=20130530
-holiday.de-DE50.name=Fronleichnam
-holiday.de-DE50.date=20130530
-holiday.de-DE51.name=Fronleichnam
-holiday.de-DE51.date=20130530
-holiday.de-DE52.name=Mariä Himmelfahrt
-holiday.de-DE52.date=20130815
-holiday.de-DE53.name=Tag der Deutschen Einheit
-holiday.de-DE53.date=20131003
-holiday.de-DE54.name=Reformationstag
-holiday.de-DE54.date=20131031
-holiday.de-DE55.name=Reformationstag
-holiday.de-DE55.date=20131031
-holiday.de-DE56.name=Reformationstag
-holiday.de-DE56.date=20131031
-holiday.de-DE57.name=Reformationstag
-holiday.de-DE57.date=20131031
-holiday.de-DE58.name=Reformationstag
-holiday.de-DE58.date=20131031
-holiday.de-DE59.name=Allerheiligen
-holiday.de-DE59.date=20131101
-holiday.de-DE60.name=Allerheiligen
-holiday.de-DE60.date=20131101
-holiday.de-DE61.name=Allerheiligen
-holiday.de-DE61.date=20131101
-holiday.de-DE62.name=Allerheiligen
-holiday.de-DE62.date=20131101
-holiday.de-DE63.name=Allerheiligen
-holiday.de-DE63.date=20131101
-holiday.de-DE64.name=Buss und Bettag
-holiday.de-DE64.date=20131120
-holiday.de-DE65.name=Heilig Abend
-holiday.de-DE65.date=20131224
-holiday.de-DE66.name=Weihnachtstag
-holiday.de-DE66.date=20131225
-holiday.de-DE67.name=Zweiter Weihnachtstag
-holiday.de-DE67.date=20131226
-holiday.de-DE68.name=Sylvester
-holiday.de-DE68.date=20131231
+holiday.de-DE48.date=20160526
+holiday.de-DE49.name=Mariä Himmelfahrt
+holiday.de-DE49.date=20160815
+holiday.de-DE50.name=Tag der Deutschen Einheit
+holiday.de-DE50.date=20161003
+holiday.de-DE51.name=Reformationstag
+holiday.de-DE51.date=20161031
+holiday.de-DE52.name=Allerheiligen
+holiday.de-DE52.date=20161101
+holiday.de-DE53.name=Buss und Bettag
+holiday.de-DE53.date=20161116
+holiday.de-DE54.name=Heilig Abend
+holiday.de-DE54.date=20161224
+holiday.de-DE55.name=Weihnachtstag
+holiday.de-DE55.date=20161225
+holiday.de-DE56.name=Zweiter Weihnachtstag
+holiday.de-DE56.date=20161226
+holiday.de-DE57.name=Sylvester
+holiday.de-DE57.date=20161231
--- a/doc/rc/holidays.el-GR.rc
+++ b/doc/rc/holidays.el-GR.rc
@@ -0,0 +1,113 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/el-GR/2014.json
+# http://holidata.net/el-GR/2015.json
+#
+# Copyright 2006 - 2015, 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.el-GR1.name=Πρωτοχρονιά
+holiday.el-GR1.date=20140101
+holiday.el-GR2.name=Θεοφάνεια
+holiday.el-GR2.date=20140106
+holiday.el-GR3.name=Καθαρά Δευτέρα
+holiday.el-GR3.date=20140303
+holiday.el-GR4.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
+holiday.el-GR4.date=20140325
+holiday.el-GR5.name=Πρωτομαγιά
+holiday.el-GR5.date=20140418
+holiday.el-GR6.name=Μεγάλη Παρασκευή
+holiday.el-GR6.date=20140419
+holiday.el-GR7.name=Μεγάλο Σάββατο
+holiday.el-GR7.date=20140420
+holiday.el-GR8.name=Πάσχα
+holiday.el-GR8.date=20140421
+holiday.el-GR9.name=Δευτέρα του Πάσχα
+holiday.el-GR9.date=20140422
+holiday.el-GR10.name=Δευτέρα του Αγίου Πνεύματος
+holiday.el-GR10.date=20140609
+holiday.el-GR11.name=Κοίμηση της Θεοτόκου
+holiday.el-GR11.date=20140815
+holiday.el-GR12.name=Ημέρα του ΌΧΙ
+holiday.el-GR12.date=20141028
+holiday.el-GR13.name=Χριστούγεννα
+holiday.el-GR13.date=20141225
+holiday.el-GR14.name=Επόμενη ημέρα Χριστουγέννων
+holiday.el-GR14.date=20141226
+holiday.el-GR15.name=Πρωτοχρονιά
+holiday.el-GR15.date=20150101
+holiday.el-GR16.name=Θεοφάνεια
+holiday.el-GR16.date=20150106
+holiday.el-GR17.name=Καθαρά Δευτέρα
+holiday.el-GR17.date=20150223
+holiday.el-GR18.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
+holiday.el-GR18.date=20150325
+holiday.el-GR19.name=Πρωτομαγιά
+holiday.el-GR19.date=20150418
+holiday.el-GR20.name=Μεγάλη Παρασκευή
+holiday.el-GR20.date=20150410
+holiday.el-GR21.name=Μεγάλο Σάββατο
+holiday.el-GR21.date=20150411
+holiday.el-GR22.name=Πάσχα
+holiday.el-GR22.date=20150412
+holiday.el-GR23.name=Δευτέρα του Πάσχα
+holiday.el-GR23.date=20150413
+holiday.el-GR24.name=Δευτέρα του Αγίου Πνεύματος
+holiday.el-GR24.date=20150601
+holiday.el-GR25.name=Κοίμηση της Θεοτόκου
+holiday.el-GR25.date=20150815
+holiday.el-GR26.name=Ημέρα του ΌΧΙ
+holiday.el-GR26.date=20151028
+holiday.el-GR27.name=Χριστούγεννα
+holiday.el-GR27.date=20151225
+holiday.el-GR28.name=Επόμενη ημέρα Χριστουγέννων
+holiday.el-GR28.date=20151226
+holiday.el-GR29.name=Πρωτοχρονιά
+holiday.el-GR29.date=20160101
+holiday.el-GR30.name=Θεοφάνεια
+holiday.el-GR30.date=20160106
+holiday.el-GR31.name=Καθαρά Δευτέρα
+holiday.el-GR31.date=20160314
+holiday.el-GR32.name=Ευαγγελισμός της Θεοτόκου και Εθνική Ημέρα Ανεξαρτησίας της Ελλάδας
+holiday.el-GR32.date=20160325
+holiday.el-GR33.name=Πρωτομαγιά
+holiday.el-GR33.date=20160418
+holiday.el-GR34.name=Μεγάλη Παρασκευή
+holiday.el-GR34.date=20160429
+holiday.el-GR35.name=Μεγάλο Σάββατο
+holiday.el-GR35.date=20160430
+holiday.el-GR36.name=Πάσχα
+holiday.el-GR36.date=20160501
+holiday.el-GR37.name=Δευτέρα του Πάσχα
+holiday.el-GR37.date=20160502
+holiday.el-GR38.name=Δευτέρα του Αγίου Πνεύματος
+holiday.el-GR38.date=20160620
+holiday.el-GR39.name=Κοίμηση της Θεοτόκου
+holiday.el-GR39.date=20160815
+holiday.el-GR40.name=Ημέρα του ΌΧΙ
+holiday.el-GR40.date=20161028
+holiday.el-GR41.name=Χριστούγεννα
+holiday.el-GR41.date=20161225
+holiday.el-GR42.name=Επόμενη ημέρα Χριστουγέννων
+holiday.el-GR42.date=20161226
--- a/doc/rc/holidays.en-AU.rc
+++ b/doc/rc/holidays.en-AU.rc
@@ -0,0 +1,165 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/en-AU/2014.json
+# http://holidata.net/en-AU/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.en-AU2.name=Australia Day
+holiday.en-AU2.date=20140126
+holiday.en-AU3.name=Royal Hobart Regatta
+holiday.en-AU3.date=20140210
+holiday.en-AU4.name=Labour Day
+holiday.en-AU4.date=20140303
+holiday.en-AU5.name=Labour Day
+holiday.en-AU5.date=20140310
+holiday.en-AU6.name=Canberra Day
+holiday.en-AU6.date=20140310
+holiday.en-AU7.name=Eight Hours Day
+holiday.en-AU7.date=20140310
+holiday.en-AU8.name=Good Friday
+holiday.en-AU8.date=20140418
+holiday.en-AU9.name=Easter Saturday
+holiday.en-AU9.date=20140419
+holiday.en-AU10.name=Easter Sunday
+holiday.en-AU10.date=20140420
+holiday.en-AU11.name=Easter Monday
+holiday.en-AU11.date=20140421
+holiday.en-AU12.name=Anzac Day
+holiday.en-AU12.date=20140425
+holiday.en-AU13.name=May Day
+holiday.en-AU13.date=20140505
+holiday.en-AU14.name=Foundation Day
+holiday.en-AU14.date=20140602
+holiday.en-AU15.name=Queen's Birthday
+holiday.en-AU15.date=20140609
+holiday.en-AU16.name=Picnic Day
+holiday.en-AU16.date=20140804
+holiday.en-AU17.name=Bank Holiday
+holiday.en-AU17.date=20140804
+holiday.en-AU18.name=Queen's Birthday
+holiday.en-AU18.date=20140929
+holiday.en-AU19.name=Labour Day
+holiday.en-AU19.date=20141006
+holiday.en-AU20.name=Recreation Day
+holiday.en-AU20.date=20141103
+holiday.en-AU21.name=Christmas Day
+holiday.en-AU21.date=20141225
+holiday.en-AU22.name=Boxing Day
+holiday.en-AU22.date=20141226
+holiday.en-AU23.name=Proclamation Day
+holiday.en-AU23.date=20141226
+holiday.en-AU24.name=New Year's Day
+holiday.en-AU24.date=20150101
+holiday.en-AU25.name=Australia Day
+holiday.en-AU25.date=20150126
+holiday.en-AU26.name=Royal Hobart Regatta
+holiday.en-AU26.date=20150209
+holiday.en-AU27.name=Labour Day
+holiday.en-AU27.date=20150302
+holiday.en-AU28.name=Labour Day
+holiday.en-AU28.date=20150309
+holiday.en-AU29.name=Canberra Day
+holiday.en-AU29.date=20150309
+holiday.en-AU30.name=Eight Hours Day
+holiday.en-AU30.date=20150309
+holiday.en-AU31.name=Good Friday
+holiday.en-AU31.date=20150403
+holiday.en-AU32.name=Easter Saturday
+holiday.en-AU32.date=20150404
+holiday.en-AU33.name=Easter Sunday
+holiday.en-AU33.date=20150405
+holiday.en-AU34.name=Easter Monday
+holiday.en-AU34.date=20150406
+holiday.en-AU35.name=Anzac Day
+holiday.en-AU35.date=20150425
+holiday.en-AU36.name=May Day
+holiday.en-AU36.date=20150504
+holiday.en-AU37.name=Foundation Day
+holiday.en-AU37.date=20150601
+holiday.en-AU38.name=Queen's Birthday
+holiday.en-AU38.date=20150608
+holiday.en-AU39.name=Picnic Day
+holiday.en-AU39.date=20150803
+holiday.en-AU40.name=Bank Holiday
+holiday.en-AU40.date=20150803
+holiday.en-AU41.name=Queen's Birthday
+holiday.en-AU41.date=20150928
+holiday.en-AU42.name=Labour Day
+holiday.en-AU42.date=20151005
+holiday.en-AU43.name=Recreation Day
+holiday.en-AU43.date=20151102
+holiday.en-AU44.name=Christmas Day
+holiday.en-AU44.date=20151225
+holiday.en-AU45.name=Boxing Day
+holiday.en-AU45.date=20151226
+holiday.en-AU46.name=Proclamation Day
+holiday.en-AU46.date=20151226
+holiday.en-AU47.name=New Year's Day
+holiday.en-AU47.date=20160101
+holiday.en-AU48.name=Australia Day
+holiday.en-AU48.date=20160126
+holiday.en-AU49.name=Royal Hobart Regatta
+holiday.en-AU49.date=20160208
+holiday.en-AU50.name=Labour Day
+holiday.en-AU50.date=20160307
+holiday.en-AU51.name=Labour Day
+holiday.en-AU51.date=20160314
+holiday.en-AU52.name=Canberra Day
+holiday.en-AU52.date=20160314
+holiday.en-AU53.name=Eight Hours Day
+holiday.en-AU53.date=20160314
+holiday.en-AU54.name=Good Friday
+holiday.en-AU54.date=20160325
+holiday.en-AU55.name=Easter Saturday
+holiday.en-AU55.date=20160326
+holiday.en-AU56.name=Easter Monday
+holiday.en-AU56.date=20160327
+holiday.en-AU57.name=Anzac Day
+holiday.en-AU57.date=20160425
+holiday.en-AU58.name=May Day
+holiday.en-AU58.date=20160502
+holiday.en-AU59.name=Foundation Day
+holiday.en-AU59.date=20160603
+holiday.en-AU60.name=Queen's Birthday
+holiday.en-AU60.date=20160613
+holiday.en-AU61.name=Picnic Day
+holiday.en-AU61.date=20160801
+holiday.en-AU62.name=Bank Holiday
+holiday.en-AU62.date=20160801
+holiday.en-AU63.name=Queen's Birthday
+holiday.en-AU63.date=20160926
+holiday.en-AU64.name=Labour Day
+holiday.en-AU64.date=20161003
+holiday.en-AU65.name=Recreation Day
+holiday.en-AU65.date=20161107
+holiday.en-AU66.name=Christmas Day
+holiday.en-AU66.date=20161225
+holiday.en-AU67.name=Boxing Day
+holiday.en-AU67.date=20161226
+holiday.en-AU68.name=Proclamation Day
+holiday.en-AU68.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/2012.json
-# http://holidata.net/en-CA/2013.json
+# http://holidata.net/en-CA/2014.json
+# http://holidata.net/en-CA/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,58 +28,74 @@
 ###############################################################################

 holiday.en-CA1.name=New Year's Day
-holiday.en-CA1.date=20120101
-holiday.en-CA2.name=New Year's Day (obs.)
-holiday.en-CA2.date=20120102
-holiday.en-CA3.name=Family Day
-holiday.en-CA3.date=20120220
-holiday.en-CA4.name=Good Friday
-holiday.en-CA4.date=20120406
-holiday.en-CA5.name=Easter Monday
-holiday.en-CA5.date=20120409
-holiday.en-CA6.name=Victoria Day
-holiday.en-CA6.date=20120521
-holiday.en-CA7.name=Canada Day
-holiday.en-CA7.date=20120701
-holiday.en-CA8.name=Canada Day (obs.)
-holiday.en-CA8.date=20120702
-holiday.en-CA9.name=First Monday of August
-holiday.en-CA9.date=20120806
-holiday.en-CA10.name=Labour Day
-holiday.en-CA10.date=20120903
-holiday.en-CA11.name=Thanksgiving Day
-holiday.en-CA11.date=20121008
-holiday.en-CA12.name=Remembrance Day
-holiday.en-CA12.date=20121111
-holiday.en-CA13.name=Christmas Day
-holiday.en-CA13.date=20121225
-holiday.en-CA14.name=Boxing Day
-holiday.en-CA14.date=20121226
-holiday.en-CA15.name=New Year's Eve
-holiday.en-CA15.date=20121231
-holiday.en-CA16.name=New Year's Day
-holiday.en-CA16.date=20130101
-holiday.en-CA17.name=Family Day
-holiday.en-CA17.date=20130218
-holiday.en-CA18.name=Good Friday
-holiday.en-CA18.date=20130329
-holiday.en-CA19.name=Easter Monday
-holiday.en-CA19.date=20130401
-holiday.en-CA20.name=Victoria Day
-holiday.en-CA20.date=20130520
-holiday.en-CA21.name=Canada Day
-holiday.en-CA21.date=20130701
-holiday.en-CA22.name=First Monday of August
-holiday.en-CA22.date=20130805
-holiday.en-CA23.name=Labour Day
-holiday.en-CA23.date=20130902
-holiday.en-CA24.name=Thanksgiving Day
-holiday.en-CA24.date=20131014
-holiday.en-CA25.name=Remembrance Day
-holiday.en-CA25.date=20131111
-holiday.en-CA26.name=Christmas Day
-holiday.en-CA26.date=20131225
-holiday.en-CA27.name=Boxing Day
-holiday.en-CA27.date=20131226
-holiday.en-CA28.name=New Year's Eve
-holiday.en-CA28.date=20131231
+holiday.en-CA1.date=20140101
+holiday.en-CA2.name=Family Day
+holiday.en-CA2.date=20140210
+holiday.en-CA3.name=Good Friday
+holiday.en-CA3.date=20140418
+holiday.en-CA4.name=Easter Monday
+holiday.en-CA4.date=20140421
+holiday.en-CA5.name=Victoria Day
+holiday.en-CA5.date=20140519
+holiday.en-CA6.name=Canada Day
+holiday.en-CA6.date=20140701
+holiday.en-CA7.name=First Monday of August
+holiday.en-CA7.date=20140804
+holiday.en-CA8.name=Labour Day
+holiday.en-CA8.date=20140901
+holiday.en-CA9.name=Thanksgiving Day
+holiday.en-CA9.date=20141013
+holiday.en-CA10.name=Remembrance Day
+holiday.en-CA10.date=20141111
+holiday.en-CA11.name=Christmas Day
+holiday.en-CA11.date=20141225
+holiday.en-CA12.name=Boxing Day
+holiday.en-CA12.date=20141226
+holiday.en-CA13.name=New Year's Day
+holiday.en-CA13.date=20150101
+holiday.en-CA14.name=Family Day
+holiday.en-CA14.date=20150209
+holiday.en-CA15.name=Good Friday
+holiday.en-CA15.date=20150403
+holiday.en-CA16.name=Easter Monday
+holiday.en-CA16.date=20150406
+holiday.en-CA17.name=Victoria Day
+holiday.en-CA17.date=20150518
+holiday.en-CA18.name=Canada Day
+holiday.en-CA18.date=20150701
+holiday.en-CA19.name=First Monday of August
+holiday.en-CA19.date=20150803
+holiday.en-CA20.name=Labour Day
+holiday.en-CA20.date=20150907
+holiday.en-CA21.name=Thanksgiving Day
+holiday.en-CA21.date=20151012
+holiday.en-CA22.name=Remembrance Day
+holiday.en-CA22.date=20151111
+holiday.en-CA23.name=Christmas Day
+holiday.en-CA23.date=20151225
+holiday.en-CA24.name=Boxing Day
+holiday.en-CA24.date=20151226
+holiday.en-CA25.name=New Year's Day
+holiday.en-CA25.date=20160101
+holiday.en-CA26.name=Family Day
+holiday.en-CA26.date=20160208
+holiday.en-CA27.name=Good Friday
+holiday.en-CA27.date=20160325
+holiday.en-CA28.name=Easter Monday
+holiday.en-CA28.date=20160328
+holiday.en-CA29.name=Victoria Day
+holiday.en-CA29.date=20160523
+holiday.en-CA30.name=Canada Day
+holiday.en-CA30.date=20160701
+holiday.en-CA31.name=First Monday of August
+holiday.en-CA31.date=20160801
+holiday.en-CA32.name=Labour Day
+holiday.en-CA32.date=20160905
+holiday.en-CA33.name=Thanksgiving Day
+holiday.en-CA33.date=20161010
+holiday.en-CA34.name=Remembrance Day
+holiday.en-CA34.date=20161111
+holiday.en-CA35.name=Christmas Day
+holiday.en-CA35.date=20161225
+holiday.en-CA36.name=Boxing Day
+holiday.en-CA36.date=20161226
--- 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/2012.json
-# http://holidata.net/en-GB/2013.json
+# http://holidata.net/en-GB/2014.json
+# http://holidata.net/en-GB/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,38 +28,50 @@
 ###############################################################################

 holiday.en-GB1.name=New Year's Day
-holiday.en-GB1.date=20120101
-holiday.en-GB2.name=New Year's Day Holiday
-holiday.en-GB2.date=20120102
-holiday.en-GB3.name=Good Friday
-holiday.en-GB3.date=20120406
-holiday.en-GB4.name=Easter Monday
-holiday.en-GB4.date=20120409
-holiday.en-GB5.name=Early May Bank Holiday
-holiday.en-GB5.date=20120507
-holiday.en-GB6.name=Spring Bank Holiday
-holiday.en-GB6.date=20120604
-holiday.en-GB7.name=Queen's Diamond Jubilee
-holiday.en-GB7.date=20120605
-holiday.en-GB8.name=August Bank Holiday
-holiday.en-GB8.date=20120827
-holiday.en-GB9.name=Christmas Day
-holiday.en-GB9.date=20121225
-holiday.en-GB10.name=Boxing Day
-holiday.en-GB10.date=20121226
-holiday.en-GB11.name=New Year's Day
-holiday.en-GB11.date=20130101
-holiday.en-GB12.name=Good Friday
-holiday.en-GB12.date=20130329
-holiday.en-GB13.name=Easter Monday
-holiday.en-GB13.date=20130401
-holiday.en-GB14.name=Early May Bank Holiday
-holiday.en-GB14.date=20130506
-holiday.en-GB15.name=Spring Bank Holiday
-holiday.en-GB15.date=20130527
-holiday.en-GB16.name=August Bank Holiday
-holiday.en-GB16.date=20130826
-holiday.en-GB17.name=Christmas Day
-holiday.en-GB17.date=20131225
-holiday.en-GB18.name=Boxing Day
-holiday.en-GB18.date=20131226
+holiday.en-GB1.date=20140101
+holiday.en-GB2.name=Good Friday
+holiday.en-GB2.date=20140418
+holiday.en-GB3.name=Easter Monday
+holiday.en-GB3.date=20140421
+holiday.en-GB4.name=Early May Bank Holiday
+holiday.en-GB4.date=20140505
+holiday.en-GB5.name=Spring Bank Holiday
+holiday.en-GB5.date=20140526
+holiday.en-GB6.name=August Bank Holiday
+holiday.en-GB6.date=20140825
+holiday.en-GB7.name=Christmas Day
+holiday.en-GB7.date=20141225
+holiday.en-GB8.name=Boxing Day
+holiday.en-GB8.date=20141226
+holiday.en-GB9.name=New Year's Day
+holiday.en-GB9.date=20150101
+holiday.en-GB10.name=Good Friday
+holiday.en-GB10.date=20150403
+holiday.en-GB11.name=Easter Monday
+holiday.en-GB11.date=20150406
+holiday.en-GB12.name=Early May Bank Holiday
+holiday.en-GB12.date=20150504
+holiday.en-GB13.name=Spring Bank Holiday
+holiday.en-GB13.date=20150525
+holiday.en-GB14.name=August Bank Holiday
+holiday.en-GB14.date=20150831
+holiday.en-GB15.name=Christmas Day
+holiday.en-GB15.date=20151225
+holiday.en-GB16.name=Boxing Day
+holiday.en-GB16.date=20151226
+holiday.en-GB17.name=New Year's Day
+holiday.en-GB17.date=20160101
+holiday.en-GB18.name=Good Friday
+holiday.en-GB18.date=20160325
+holiday.en-GB19.name=Easter Monday
+holiday.en-GB19.date=20160328
+holiday.en-GB20.name=Early May Bank Holiday
+holiday.en-GB20.date=20160502
+holiday.en-GB21.name=Spring Bank Holiday
+holiday.en-GB21.date=20160530
+holiday.en-GB22.name=August Bank Holiday
+holiday.en-GB22.date=20160829
+holiday.en-GB23.name=Christmas Day
+holiday.en-GB23.date=20161225
+holiday.en-GB24.name=Boxing Day
+holiday.en-GB24.date=20161226
--- a/doc/rc/holidays.en-GL.rc
+++ b/doc/rc/holidays.en-GL.rc
@@ -0,0 +1,107 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/en-GL/2014.json
+# http://holidata.net/en-GL/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.en-GL2.name=Epiphany
+holiday.en-GL2.date=20140106
+holiday.en-GL3.name=Maundy Thursday
+holiday.en-GL3.date=20140417
+holiday.en-GL4.name=Good Friday
+holiday.en-GL4.date=20140318
+holiday.en-GL5.name=Easter Monday
+holiday.en-GL5.date=20140421
+holiday.en-GL6.name=General Prayer Day
+holiday.en-GL6.date=20140516
+holiday.en-GL7.name=Ascension
+holiday.en-GL7.date=20140529
+holiday.en-GL8.name=Whit Monday
+holiday.en-GL8.date=20140609
+holiday.en-GL9.name=Ullortuneq
+holiday.en-GL9.date=20140621
+holiday.en-GL10.name=Christmas Eve
+holiday.en-GL10.date=20141224
+holiday.en-GL11.name=Christmas Day
+holiday.en-GL11.date=20141225
+holiday.en-GL12.name=St Stephen's Day
+holiday.en-GL12.date=20141226
+holiday.en-GL13.name=New Year's Eve
+holiday.en-GL13.date=20141231
+holiday.en-GL14.name=New Year's Day
+holiday.en-GL14.date=20150101
+holiday.en-GL15.name=Epiphany
+holiday.en-GL15.date=20150106
+holiday.en-GL16.name=Maundy Thursday
+holiday.en-GL16.date=20150402
+holiday.en-GL17.name=Good Friday
+holiday.en-GL17.date=20150303
+holiday.en-GL18.name=Easter Monday
+holiday.en-GL18.date=20150406
+holiday.en-GL19.name=General Prayer Day
+holiday.en-GL19.date=20150501
+holiday.en-GL20.name=Ascension
+holiday.en-GL20.date=20150514
+holiday.en-GL21.name=Whit Monday
+holiday.en-GL21.date=20150525
+holiday.en-GL22.name=Ullortuneq
+holiday.en-GL22.date=20150621
+holiday.en-GL23.name=Christmas Eve
+holiday.en-GL23.date=20151224
+holiday.en-GL24.name=Christmas Day
+holiday.en-GL24.date=20151225
+holiday.en-GL25.name=St Stephen's Day
+holiday.en-GL25.date=20151226
+holiday.en-GL26.name=New Year's Eve
+holiday.en-GL26.date=20151231
+holiday.en-GL27.name=New Year's Day
+holiday.en-GL27.date=20160101
+holiday.en-GL28.name=Epiphany
+holiday.en-GL28.date=20160106
+holiday.en-GL29.name=Maundy Thursday
+holiday.en-GL29.date=20160324
+holiday.en-GL30.name=Good Friday
+holiday.en-GL30.date=20160325
+holiday.en-GL31.name=Easter Monday
+holiday.en-GL31.date=20160428
+holiday.en-GL32.name=General Prayer Day
+holiday.en-GL32.date=20160422
+holiday.en-GL33.name=Ascension
+holiday.en-GL33.date=20160505
+holiday.en-GL34.name=Whit Monday
+holiday.en-GL34.date=20160516
+holiday.en-GL35.name=Ullortuneq
+holiday.en-GL35.date=20160621
+holiday.en-GL36.name=Christmas Eve
+holiday.en-GL36.date=20161224
+holiday.en-GL37.name=Christmas Day
+holiday.en-GL37.date=20161225
+holiday.en-GL38.name=St Stephen's Day
+holiday.en-GL38.date=20161226
+holiday.en-GL39.name=New Year's Eve
+holiday.en-GL39.date=20161231
--- a/doc/rc/holidays.en-HK.rc
+++ b/doc/rc/holidays.en-HK.rc
@@ -0,0 +1,127 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/en-HK/2014.json
+# http://holidata.net/en-HK/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.en-HK2.name=The second day of Lunar New Year
+holiday.en-HK2.date=20140201
+holiday.en-HK3.name=The fourth day of Lunar New Year
+holiday.en-HK3.date=20140203
+holiday.en-HK4.name=Good Friday
+holiday.en-HK4.date=20140418
+holiday.en-HK5.name=The day following Good Friday
+holiday.en-HK5.date=20140419
+holiday.en-HK6.name=Easter Monday
+holiday.en-HK6.date=20140421
+holiday.en-HK7.name=Ching Ming Festival
+holiday.en-HK7.date=20140405
+holiday.en-HK8.name=Labour Day
+holiday.en-HK8.date=20140501
+holiday.en-HK9.name=The Birthday of the Buddha
+holiday.en-HK9.date=20140506
+holiday.en-HK10.name=Tuen Ng Festival
+holiday.en-HK10.date=20140602
+holiday.en-HK11.name=Hong Kong Special Administrative Region Establishment Day
+holiday.en-HK11.date=20140701
+holiday.en-HK12.name=The day following the Chinese Mid-Autumn Festival
+holiday.en-HK12.date=20140909
+holiday.en-HK13.name=National Day
+holiday.en-HK13.date=20141001
+holiday.en-HK14.name=Chung Yeung Festival
+holiday.en-HK14.date=20141002
+holiday.en-HK15.name=Christmas Day
+holiday.en-HK15.date=20141225
+holiday.en-HK16.name=The first weekday after Christmas Day
+holiday.en-HK16.date=20141226
+holiday.en-HK17.name=The first day of January
+holiday.en-HK17.date=20150101
+holiday.en-HK18.name=Lunar New Year’s Day
+holiday.en-HK18.date=20150219
+holiday.en-HK19.name=The second day of Lunar New Year
+holiday.en-HK19.date=20150220
+holiday.en-HK20.name=The third day of Lunar New Year
+holiday.en-HK20.date=20150221
+holiday.en-HK21.name=Good Friday
+holiday.en-HK21.date=20150403
+holiday.en-HK22.name=The day following Good Friday
+holiday.en-HK22.date=20150404
+holiday.en-HK23.name=The day following Ching Ming Festival
+holiday.en-HK23.date=20150406
+holiday.en-HK24.name=The day following Easter Monday
+holiday.en-HK24.date=20150407
+holiday.en-HK25.name=Labour Day
+holiday.en-HK25.date=20150501
+holiday.en-HK26.name=The Birthday of the Buddha
+holiday.en-HK26.date=20150525
+holiday.en-HK27.name=Tuen Ng Festival
+holiday.en-HK27.date=20150620
+holiday.en-HK28.name=Hong Kong Special Administrative Region Establishment Day
+holiday.en-HK28.date=20150701
+holiday.en-HK29.name=The day following the Chinese Mid-Autumn Festival
+holiday.en-HK29.date=20150928
+holiday.en-HK30.name=National Day
+holiday.en-HK30.date=20151001
+holiday.en-HK31.name=Chung Yeung Festival
+holiday.en-HK31.date=20151021
+holiday.en-HK32.name=Christmas Day
+holiday.en-HK32.date=20151225
+holiday.en-HK33.name=The first weekday after Christmas Day
+holiday.en-HK33.date=20151226
+holiday.en-HK34.name=The first day of January
+holiday.en-HK34.date=20160101
+holiday.en-HK35.name=Lunar New Year’s Day
+holiday.en-HK35.date=20160208
+holiday.en-HK36.name=The second day of Lunar New Year
+holiday.en-HK36.date=20160209
+holiday.en-HK37.name=The third day of Lunar New Year
+holiday.en-HK37.date=20160210
+holiday.en-HK38.name=Good Friday
+holiday.en-HK38.date=20160325
+holiday.en-HK39.name=The day following Good Friday
+holiday.en-HK39.date=20160326
+holiday.en-HK40.name=Ching Ming Festival
+holiday.en-HK40.date=20160404
+holiday.en-HK41.name=Labour Day
+holiday.en-HK41.date=20160501
+holiday.en-HK42.name=The Birthday of the Buddha
+holiday.en-HK42.date=20160514
+holiday.en-HK43.name=Tuen Ng Festival
+holiday.en-HK43.date=20160609
+holiday.en-HK44.name=Hong Kong Special Administrative Region Establishment Day
+holiday.en-HK44.date=20160701
+holiday.en-HK45.name=The day following the Chinese Mid-Autumn Festival
+holiday.en-HK45.date=20160916
+holiday.en-HK46.name=National Day
+holiday.en-HK46.date=20161001
+holiday.en-HK47.name=Chung Yeung Festival
+holiday.en-HK47.date=20161010
+holiday.en-HK48.name=Christmas Day
+holiday.en-HK48.date=20161225
+holiday.en-HK49.name=The first weekday after Christmas Day
+holiday.en-HK49.date=20161226
--- 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/2012.json
-# http://holidata.net/en-NZ/2013.json
+# http://holidata.net/en-NZ/2014.json
+# http://holidata.net/en-NZ/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,42 +28,62 @@
 ###############################################################################

 holiday.en-NZ1.name=New Year's Day
-holiday.en-NZ1.date=20120101
+holiday.en-NZ1.date=20140101
 holiday.en-NZ2.name=Day after New Years Day
-holiday.en-NZ2.date=20120102
+holiday.en-NZ2.date=20140102
 holiday.en-NZ3.name=Waitangi Day
-holiday.en-NZ3.date=20120206
+holiday.en-NZ3.date=20140206
 holiday.en-NZ4.name=Good Friday
-holiday.en-NZ4.date=20120406
+holiday.en-NZ4.date=20140418
 holiday.en-NZ5.name=Easter Monday
-holiday.en-NZ5.date=20120409
+holiday.en-NZ5.date=20140421
 holiday.en-NZ6.name=ANZAC Day
-holiday.en-NZ6.date=20120425
+holiday.en-NZ6.date=20140425
 holiday.en-NZ7.name=Queen's Birthday
-holiday.en-NZ7.date=20120604
+holiday.en-NZ7.date=20140602
 holiday.en-NZ8.name=Labour Day
-holiday.en-NZ8.date=20121022
+holiday.en-NZ8.date=20141027
 holiday.en-NZ9.name=Christmas Day
-holiday.en-NZ9.date=20121225
+holiday.en-NZ9.date=20141225
 holiday.en-NZ10.name=Boxing Day
-holiday.en-NZ10.date=20121226
+holiday.en-NZ10.date=20141226
 holiday.en-NZ11.name=New Year's Day
-holiday.en-NZ11.date=20130101
+holiday.en-NZ11.date=20150101
 holiday.en-NZ12.name=Day after New Years Day
-holiday.en-NZ12.date=20130102
+holiday.en-NZ12.date=20150102
 holiday.en-NZ13.name=Waitangi Day
-holiday.en-NZ13.date=20130206
+holiday.en-NZ13.date=20150206
 holiday.en-NZ14.name=Good Friday
-holiday.en-NZ14.date=20130329
+holiday.en-NZ14.date=20150403
 holiday.en-NZ15.name=Easter Monday
-holiday.en-NZ15.date=20130401
+holiday.en-NZ15.date=20150406
 holiday.en-NZ16.name=ANZAC Day
-holiday.en-NZ16.date=20130425
+holiday.en-NZ16.date=20150425
 holiday.en-NZ17.name=Queen's Birthday
-holiday.en-NZ17.date=20130603
+holiday.en-NZ17.date=20150601
 holiday.en-NZ18.name=Labour Day
-holiday.en-NZ18.date=20131028
+holiday.en-NZ18.date=20151026
 holiday.en-NZ19.name=Christmas Day
-holiday.en-NZ19.date=20131225
+holiday.en-NZ19.date=20151225
 holiday.en-NZ20.name=Boxing Day
-holiday.en-NZ20.date=20131226
+holiday.en-NZ20.date=20151226
+holiday.en-NZ21.name=New Year's Day
+holiday.en-NZ21.date=20160101
+holiday.en-NZ22.name=Day after New Years Day
+holiday.en-NZ22.date=20160104
+holiday.en-NZ23.name=Waitangi Day
+holiday.en-NZ23.date=20160206
+holiday.en-NZ24.name=Good Friday
+holiday.en-NZ24.date=20160325
+holiday.en-NZ25.name=Easter Monday
+holiday.en-NZ25.date=20160328
+holiday.en-NZ26.name=ANZAC Day
+holiday.en-NZ26.date=20160425
+holiday.en-NZ27.name=Queen's Birthday
+holiday.en-NZ27.date=20160606
+holiday.en-NZ28.name=Labour Day
+holiday.en-NZ28.date=20161024
+holiday.en-NZ29.name=Christmas Day
+holiday.en-NZ29.date=20161225
+holiday.en-NZ30.name=Boxing Day
+holiday.en-NZ30.date=20161226
--- 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/2012.json
-# http://holidata.net/en-US/2013.json
+# http://holidata.net/en-US/2014.json
+# http://holidata.net/en-US/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,52 +28,68 @@
 ###############################################################################

 holiday.en-US1.name=New Year's Day
-holiday.en-US1.date=20120101
-holiday.en-US2.name=New Year's Day
-holiday.en-US2.date=20120102
-holiday.en-US3.name=Birthday of Martin Luther King, Jr.
-holiday.en-US3.date=20120116
-holiday.en-US4.name=Washington's Birthday
-holiday.en-US4.date=20120220
-holiday.en-US5.name=Patriots' Day
-holiday.en-US5.date=20120416
-holiday.en-US6.name=Patriots' Day
-holiday.en-US6.date=20120416
-holiday.en-US7.name=Memorial Day
-holiday.en-US7.date=20120528
-holiday.en-US8.name=Independence Day
-holiday.en-US8.date=20120704
-holiday.en-US9.name=Labor Day
-holiday.en-US9.date=20120903
-holiday.en-US10.name=Columbus Day
-holiday.en-US10.date=20121008
-holiday.en-US11.name=Veterans Day
-holiday.en-US11.date=20121112
-holiday.en-US12.name=Thanksgiving Day
-holiday.en-US12.date=20121122
-holiday.en-US13.name=Christmas Day
-holiday.en-US13.date=20121225
-holiday.en-US14.name=New Year's Day
-holiday.en-US14.date=20130101
-holiday.en-US15.name=Birthday of Martin Luther King, Jr.
-holiday.en-US15.date=20130121
-holiday.en-US16.name=Washington's Birthday
-holiday.en-US16.date=20130218
-holiday.en-US17.name=Patriots' Day
-holiday.en-US17.date=20130415
-holiday.en-US18.name=Patriots' Day
-holiday.en-US18.date=20130415
-holiday.en-US19.name=Memorial Day
-holiday.en-US19.date=20130527
-holiday.en-US20.name=Independence Day
-holiday.en-US20.date=20130704
-holiday.en-US21.name=Labor Day
-holiday.en-US21.date=20130902
-holiday.en-US22.name=Columbus Day
-holiday.en-US22.date=20131014
-holiday.en-US23.name=Veterans Day
-holiday.en-US23.date=20131111
-holiday.en-US24.name=Thanksgiving Day
-holiday.en-US24.date=20131128
-holiday.en-US25.name=Christmas Day
-holiday.en-US25.date=20131225
+holiday.en-US1.date=20140101
+holiday.en-US2.name=Birthday of Martin Luther King, Jr.
+holiday.en-US2.date=20140120
+holiday.en-US3.name=Washington's Birthday
+holiday.en-US3.date=20140217
+holiday.en-US4.name=Patriots' Day
+holiday.en-US4.date=20140421
+holiday.en-US5.name=Memorial Day
+holiday.en-US5.date=20140526
+holiday.en-US6.name=Independence Day
+holiday.en-US6.date=20140704
+holiday.en-US7.name=Labor Day
+holiday.en-US7.date=20140901
+holiday.en-US8.name=Columbus Day
+holiday.en-US8.date=20141013
+holiday.en-US9.name=Veterans Day
+holiday.en-US9.date=20141111
+holiday.en-US10.name=Thanksgiving Day
+holiday.en-US10.date=20141127
+holiday.en-US11.name=Christmas Day
+holiday.en-US11.date=20141225
+holiday.en-US12.name=New Year's Day
+holiday.en-US12.date=20150101
+holiday.en-US13.name=Birthday of Martin Luther King, Jr.
+holiday.en-US13.date=20150119
+holiday.en-US14.name=Washington's Birthday
+holiday.en-US14.date=20150216
+holiday.en-US15.name=Patriots' Day
+holiday.en-US15.date=20150420
+holiday.en-US16.name=Memorial Day
+holiday.en-US16.date=20150525
+holiday.en-US17.name=Independence Day
+holiday.en-US17.date=20150704
+holiday.en-US18.name=Labor Day
+holiday.en-US18.date=20150907
+holiday.en-US19.name=Columbus Day
+holiday.en-US19.date=20151012
+holiday.en-US20.name=Veterans Day
+holiday.en-US20.date=20151111
+holiday.en-US21.name=Thanksgiving Day
+holiday.en-US21.date=20151126
+holiday.en-US22.name=Christmas Day
+holiday.en-US22.date=20151225
+holiday.en-US23.name=New Year's Day
+holiday.en-US23.date=20160101
+holiday.en-US24.name=Birthday of Martin Luther King, Jr.
+holiday.en-US24.date=20160118
+holiday.en-US25.name=Washington's Birthday
+holiday.en-US25.date=20160215
+holiday.en-US26.name=Patriots' Day
+holiday.en-US26.date=20160418
+holiday.en-US27.name=Memorial Day
+holiday.en-US27.date=20160530
+holiday.en-US28.name=Independence Day
+holiday.en-US28.date=20160704
+holiday.en-US29.name=Labor Day
+holiday.en-US29.date=20160905
+holiday.en-US30.name=Columbus Day
+holiday.en-US30.date=20161010
+holiday.en-US31.name=Veterans Day
+holiday.en-US31.date=20161111
+holiday.en-US32.name=Thanksgiving Day
+holiday.en-US32.date=20161124
+holiday.en-US33.name=Christmas Day
+holiday.en-US33.date=20161225
--- a/doc/rc/holidays.en-ZA.rc
+++ b/doc/rc/holidays.en-ZA.rc
@@ -0,0 +1,101 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/en-ZA/2014.json
+# http://holidata.net/en-ZA/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.en-ZA2.name=Human Rights Day
+holiday.en-ZA2.date=20140321
+holiday.en-ZA3.name=Good Friday
+holiday.en-ZA3.date=20140418
+holiday.en-ZA4.name=Family Day
+holiday.en-ZA4.date=20140421
+holiday.en-ZA5.name=Freedom Day
+holiday.en-ZA5.date=20140427
+holiday.en-ZA6.name=Workers' Day
+holiday.en-ZA6.date=20140501
+holiday.en-ZA7.name=Youth Day
+holiday.en-ZA7.date=20140616
+holiday.en-ZA8.name=National Women's Day
+holiday.en-ZA8.date=20140809
+holiday.en-ZA9.name=Heritage Day
+holiday.en-ZA9.date=20140924
+holiday.en-ZA10.name=Day of Reconciliation
+holiday.en-ZA10.date=20141217
+holiday.en-ZA11.name=Christmas Day
+holiday.en-ZA11.date=20141225
+holiday.en-ZA12.name=Day of Goodwill
+holiday.en-ZA12.date=20141226
+holiday.en-ZA13.name=New Year's Day
+holiday.en-ZA13.date=20150101
+holiday.en-ZA14.name=Human Rights Day
+holiday.en-ZA14.date=20150321
+holiday.en-ZA15.name=Good Friday
+holiday.en-ZA15.date=20150403
+holiday.en-ZA16.name=Family Day
+holiday.en-ZA16.date=20150406
+holiday.en-ZA17.name=Freedom Day
+holiday.en-ZA17.date=20150427
+holiday.en-ZA18.name=Workers' Day
+holiday.en-ZA18.date=20150501
+holiday.en-ZA19.name=Youth Day
+holiday.en-ZA19.date=20150616
+holiday.en-ZA20.name=National Women's Day
+holiday.en-ZA20.date=20150809
+holiday.en-ZA21.name=Heritage Day
+holiday.en-ZA21.date=20150924
+holiday.en-ZA22.name=Day of Reconciliation
+holiday.en-ZA22.date=20151217
+holiday.en-ZA23.name=Christmas Day
+holiday.en-ZA23.date=20151225
+holiday.en-ZA24.name=Day of Goodwill
+holiday.en-ZA24.date=20151226
+holiday.en-ZA25.name=New Year's Day
+holiday.en-ZA25.date=20160101
+holiday.en-ZA26.name=Human Rights Day
+holiday.en-ZA26.date=20160321
+holiday.en-ZA27.name=Good Friday
+holiday.en-ZA27.date=20160325
+holiday.en-ZA28.name=Family Day
+holiday.en-ZA28.date=20160328
+holiday.en-ZA29.name=Freedom Day
+holiday.en-ZA29.date=20160427
+holiday.en-ZA30.name=Workers' Day
+holiday.en-ZA30.date=20160501
+holiday.en-ZA31.name=Youth Day
+holiday.en-ZA31.date=20160616
+holiday.en-ZA32.name=National Women's Day
+holiday.en-ZA32.date=20160809
+holiday.en-ZA33.name=Heritage Day
+holiday.en-ZA33.date=20160924
+holiday.en-ZA34.name=Day of Reconciliation
+holiday.en-ZA34.date=20161217
+holiday.en-ZA35.name=Christmas Day
+holiday.en-ZA35.date=20161225
+holiday.en-ZA36.name=Day of Goodwill
+holiday.en-ZA36.date=20161226
--- 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/2012.json
-# http://holidata.net/es-ES/2013.json
+# http://holidata.net/es-ES/2014.json
+# http://holidata.net/es-ES/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,52 +28,80 @@
 ###############################################################################

 holiday.es-ES1.name=Año Nuevo
-holiday.es-ES1.date=20120101
+holiday.es-ES1.date=20140101
 holiday.es-ES2.name=Día de los Reyes
-holiday.es-ES2.date=20120106
+holiday.es-ES2.date=20140106
 holiday.es-ES3.name=Viernes Santo
-holiday.es-ES3.date=20120406
-holiday.es-ES4.name=Fiesta del Trabajo
-holiday.es-ES4.date=20120501
-holiday.es-ES5.name=Asunción de la Virgen
-holiday.es-ES5.date=20120815
-holiday.es-ES6.name=Fiesta Nacional de España
-holiday.es-ES6.date=20121012
-holiday.es-ES7.name=Dia de todos los Santos
-holiday.es-ES7.date=20121101
-holiday.es-ES8.name=Dia de la Constitución
-holiday.es-ES8.date=20121206
-holiday.es-ES9.name=Inmaculada Concepción
-holiday.es-ES9.date=20121208
-holiday.es-ES10.name=Noche Buena
-holiday.es-ES10.date=20121224
-holiday.es-ES11.name=Navidad
-holiday.es-ES11.date=20121225
-holiday.es-ES12.name=Noche Vieja
-holiday.es-ES12.date=20121231
-holiday.es-ES13.name=Año Nuevo
-holiday.es-ES13.date=20130101
-holiday.es-ES14.name=Día de los Reyes
-holiday.es-ES14.date=20130106
-holiday.es-ES15.name=Viernes Santo
-holiday.es-ES15.date=20130329
-holiday.es-ES16.name=Pascua
-holiday.es-ES16.date=20130331
-holiday.es-ES17.name=Fiesta del Trabajo
-holiday.es-ES17.date=20130501
-holiday.es-ES18.name=Asunción de la Virgen
-holiday.es-ES18.date=20130815
-holiday.es-ES19.name=Fiesta Nacional de España
-holiday.es-ES19.date=20131012
-holiday.es-ES20.name=Dia de todos los Santos
-holiday.es-ES20.date=20131101
-holiday.es-ES21.name=Dia de la Constitución
-holiday.es-ES21.date=20131206
-holiday.es-ES22.name=Inmaculada Concepción
-holiday.es-ES22.date=20131208
-holiday.es-ES23.name=Noche Buena
-holiday.es-ES23.date=20131224
-holiday.es-ES24.name=Navidad
-holiday.es-ES24.date=20131225
-holiday.es-ES25.name=Noche Vieja
-holiday.es-ES25.date=20131231
+holiday.es-ES3.date=20140418
+holiday.es-ES4.name=Pascua
+holiday.es-ES4.date=20140420
+holiday.es-ES5.name=Fiesta del Trabajo
+holiday.es-ES5.date=20140501
+holiday.es-ES6.name=Asunción de la Virgen
+holiday.es-ES6.date=20140815
+holiday.es-ES7.name=Fiesta Nacional de España
+holiday.es-ES7.date=20141012
+holiday.es-ES8.name=Dia de todos los Santos
+holiday.es-ES8.date=20141101
+holiday.es-ES9.name=Dia de la Constitución
+holiday.es-ES9.date=20141206
+holiday.es-ES10.name=Inmaculada Concepción
+holiday.es-ES10.date=20141208
+holiday.es-ES11.name=Noche Buena
+holiday.es-ES11.date=20141224
+holiday.es-ES12.name=Navidad
+holiday.es-ES12.date=20141225
+holiday.es-ES13.name=Noche Vieja
+holiday.es-ES13.date=20141231
+holiday.es-ES14.name=Año Nuevo
+holiday.es-ES14.date=20150101
+holiday.es-ES15.name=Día de los Reyes
+holiday.es-ES15.date=20150106
+holiday.es-ES16.name=Viernes Santo
+holiday.es-ES16.date=20150403
+holiday.es-ES17.name=Pascua
+holiday.es-ES17.date=20150405
+holiday.es-ES18.name=Fiesta del Trabajo
+holiday.es-ES18.date=20150501
+holiday.es-ES19.name=Asunción de la Virgen
+holiday.es-ES19.date=20150815
+holiday.es-ES20.name=Fiesta Nacional de España
+holiday.es-ES20.date=20151012
+holiday.es-ES21.name=Dia de todos los Santos
+holiday.es-ES21.date=20151101
+holiday.es-ES22.name=Dia de la Constitución
+holiday.es-ES22.date=20151206
+holiday.es-ES23.name=Inmaculada Concepción
+holiday.es-ES23.date=20151208
+holiday.es-ES24.name=Noche Buena
+holiday.es-ES24.date=20151224
+holiday.es-ES25.name=Navidad
+holiday.es-ES25.date=20151225
+holiday.es-ES26.name=Noche Vieja
+holiday.es-ES26.date=20151231
+holiday.es-ES27.name=Año Nuevo
+holiday.es-ES27.date=20160101
+holiday.es-ES28.name=Día de los Reyes
+holiday.es-ES28.date=20160106
+holiday.es-ES29.name=Viernes Santo
+holiday.es-ES29.date=20160325
+holiday.es-ES30.name=Pascua
+holiday.es-ES30.date=20160327
+holiday.es-ES31.name=Fiesta del Trabajo
+holiday.es-ES31.date=20160501
+holiday.es-ES32.name=Asunción de la Virgen
+holiday.es-ES32.date=20160815
+holiday.es-ES33.name=Fiesta Nacional de España
+holiday.es-ES33.date=20161012
+holiday.es-ES34.name=Dia de todos los Santos
+holiday.es-ES34.date=20161101
+holiday.es-ES35.name=Dia de la Constitución
+holiday.es-ES35.date=20161206
+holiday.es-ES36.name=Inmaculada Concepción
+holiday.es-ES36.date=20161208
+holiday.es-ES37.name=Noche Buena
+holiday.es-ES37.date=20161224
+holiday.es-ES38.name=Navidad
+holiday.es-ES38.date=20161225
+holiday.es-ES39.name=Noche Vieja
+holiday.es-ES39.date=20161231
--- a/doc/rc/holidays.es-MX.rc
+++ b/doc/rc/holidays.es-MX.rc
@@ -0,0 +1,89 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/es-MX/2014.json
+# http://holidata.net/es-MX/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.es-MX2.name=Día de la Constitución
+holiday.es-MX2.date=20140203
+holiday.es-MX3.name=Natalicio de Benito Juárez
+holiday.es-MX3.date=20140317
+holiday.es-MX4.name=Jueves Santo
+holiday.es-MX4.date=20140417
+holiday.es-MX5.name=Viernes Santo
+holiday.es-MX5.date=20140418
+holiday.es-MX6.name=Día del Trabajo
+holiday.es-MX6.date=20140501
+holiday.es-MX7.name=Día de la Independencia
+holiday.es-MX7.date=20140916
+holiday.es-MX8.name=Día de la Revolución
+holiday.es-MX8.date=20141117
+holiday.es-MX9.name=Nuestra Señora de Guadalupe
+holiday.es-MX9.date=20141212
+holiday.es-MX10.name=Navidad
+holiday.es-MX10.date=20141225
+holiday.es-MX11.name=Año Nuevo
+holiday.es-MX11.date=20150101
+holiday.es-MX12.name=Día de la Constitución
+holiday.es-MX12.date=20150202
+holiday.es-MX13.name=Natalicio de Benito Juárez
+holiday.es-MX13.date=20150316
+holiday.es-MX14.name=Jueves Santo
+holiday.es-MX14.date=20150402
+holiday.es-MX15.name=Viernes Santo
+holiday.es-MX15.date=20150403
+holiday.es-MX16.name=Día del Trabajo
+holiday.es-MX16.date=20150501
+holiday.es-MX17.name=Día de la Independencia
+holiday.es-MX17.date=20150916
+holiday.es-MX18.name=Día de la Revolución
+holiday.es-MX18.date=20151116
+holiday.es-MX19.name=Nuestra Señora de Guadalupe
+holiday.es-MX19.date=20151212
+holiday.es-MX20.name=Navidad
+holiday.es-MX20.date=20151225
+holiday.es-MX21.name=Año Nuevo
+holiday.es-MX21.date=20160101
+holiday.es-MX22.name=Día de la Constitución
+holiday.es-MX22.date=20160201
+holiday.es-MX23.name=Natalicio de Benito Juárez
+holiday.es-MX23.date=20160314
+holiday.es-MX24.name=Jueves Santo
+holiday.es-MX24.date=20160324
+holiday.es-MX25.name=Viernes Santo
+holiday.es-MX25.date=20160325
+holiday.es-MX26.name=Día del Trabajo
+holiday.es-MX26.date=20160501
+holiday.es-MX27.name=Día de la Independencia
+holiday.es-MX27.date=20160916
+holiday.es-MX28.name=Día de la Revolución
+holiday.es-MX28.date=20161121
+holiday.es-MX29.name=Nuestra Señora de Guadalupe
+holiday.es-MX29.date=20161212
+holiday.es-MX30.name=Navidad
+holiday.es-MX30.date=20161225
--- a/doc/rc/holidays.es-US.rc
+++ b/doc/rc/holidays.es-US.rc
@@ -0,0 +1,95 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/es-US/2014.json
+# http://holidata.net/es-US/2015.json
+#
+# Copyright 2006 - 2015, 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-US1.name=Año Neuvo
+holiday.es-US1.date=20140101
+holiday.es-US2.name=Cumpleaños de Martin Luther King, Jr.
+holiday.es-US2.date=20140120
+holiday.es-US3.name=Día del Presidente
+holiday.es-US3.date=20140217
+holiday.es-US4.name=Día del Patriota
+holiday.es-US4.date=20140421
+holiday.es-US5.name=Día de los Caídos
+holiday.es-US5.date=20140526
+holiday.es-US6.name=Día de la Independiencia
+holiday.es-US6.date=20140704
+holiday.es-US7.name=Día del Trabajo
+holiday.es-US7.date=20140901
+holiday.es-US8.name=Día de Columbus
+holiday.es-US8.date=20141013
+holiday.es-US9.name=Día de los Veteranos
+holiday.es-US9.date=20141111
+holiday.es-US10.name=Día de Acción de Gracias
+holiday.es-US10.date=20141127
+holiday.es-US11.name=Navidad
+holiday.es-US11.date=20141225
+holiday.es-US12.name=Año Neuvo
+holiday.es-US12.date=20150101
+holiday.es-US13.name=Cumpleaños de Martin Luther King, Jr.
+holiday.es-US13.date=20150119
+holiday.es-US14.name=Día del Presidente
+holiday.es-US14.date=20150216
+holiday.es-US15.name=Día del Patriota
+holiday.es-US15.date=20150420
+holiday.es-US16.name=Día de los Caídos
+holiday.es-US16.date=20150525
+holiday.es-US17.name=Día de la Independiencia
+holiday.es-US17.date=20150704
+holiday.es-US18.name=Día del Trabajo
+holiday.es-US18.date=20150907
+holiday.es-US19.name=Día de Columbus
+holiday.es-US19.date=20151012
+holiday.es-US20.name=Día de los Veteranos
+holiday.es-US20.date=20151111
+holiday.es-US21.name=Día de Acción de Gracias
+holiday.es-US21.date=20151126
+holiday.es-US22.name=Navidad
+holiday.es-US22.date=20151225
+holiday.es-US23.name=Año Neuvo
+holiday.es-US23.date=20160101
+holiday.es-US24.name=Cumpleaños de Martin Luther King, Jr.
+holiday.es-US24.date=20160118
+holiday.es-US25.name=Día del Presidente
+holiday.es-US25.date=20160215
+holiday.es-US26.name=Día del Patriota
+holiday.es-US26.date=20160418
+holiday.es-US27.name=Día de los Caídos
+holiday.es-US27.date=20160530
+holiday.es-US28.name=Día de la Independiencia
+holiday.es-US28.date=20160704
+holiday.es-US29.name=Día del Trabajo
+holiday.es-US29.date=20160905
+holiday.es-US30.name=Día de Columbus
+holiday.es-US30.date=20161010
+holiday.es-US31.name=Día de los Veteranos
+holiday.es-US31.date=20161111
+holiday.es-US32.name=Día de Acción de Gracias
+holiday.es-US32.date=20161124
+holiday.es-US33.name=Navidad
+holiday.es-US33.date=20161225
--- a/doc/rc/holidays.et-EE.rc
+++ b/doc/rc/holidays.et-EE.rc
@@ -0,0 +1,101 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/et-EE/2014.json
+# http://holidata.net/et-EE/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.et-EE2.name=iseseisvuspäev
+holiday.et-EE2.date=20140224
+holiday.et-EE3.name=suur reede
+holiday.et-EE3.date=20140418
+holiday.et-EE4.name=ülestõusmispühade 1. püha
+holiday.et-EE4.date=20140420
+holiday.et-EE5.name=kevadpüha
+holiday.et-EE5.date=20140501
+holiday.et-EE6.name=nelipühade 1. püha
+holiday.et-EE6.date=20140608
+holiday.et-EE7.name=võidupüha
+holiday.et-EE7.date=20140623
+holiday.et-EE8.name=jaanipäev
+holiday.et-EE8.date=20140624
+holiday.et-EE9.name=taasiseseisvumispäev
+holiday.et-EE9.date=20140820
+holiday.et-EE10.name=jõululaupäev
+holiday.et-EE10.date=20141224
+holiday.et-EE11.name=esimene jõulupüha
+holiday.et-EE11.date=20141225
+holiday.et-EE12.name=teine jõulupüha
+holiday.et-EE12.date=20141226
+holiday.et-EE13.name=uusaasta
+holiday.et-EE13.date=20150101
+holiday.et-EE14.name=iseseisvuspäev
+holiday.et-EE14.date=20150224
+holiday.et-EE15.name=suur reede
+holiday.et-EE15.date=20150403
+holiday.et-EE16.name=ülestõusmispühade 1. püha
+holiday.et-EE16.date=20150405
+holiday.et-EE17.name=kevadpüha
+holiday.et-EE17.date=20150501
+holiday.et-EE18.name=nelipühade 1. püha
+holiday.et-EE18.date=20150524
+holiday.et-EE19.name=võidupüha
+holiday.et-EE19.date=20150623
+holiday.et-EE20.name=jaanipäev
+holiday.et-EE20.date=20150624
+holiday.et-EE21.name=taasiseseisvumispäev
+holiday.et-EE21.date=20150820
+holiday.et-EE22.name=jõululaupäev
+holiday.et-EE22.date=20151224
+holiday.et-EE23.name=esimene jõulupüha
+holiday.et-EE23.date=20151225
+holiday.et-EE24.name=teine jõulupüha
+holiday.et-EE24.date=20151226
+holiday.et-EE25.name=uusaasta
+holiday.et-EE25.date=20160101
+holiday.et-EE26.name=iseseisvuspäev
+holiday.et-EE26.date=20160224
+holiday.et-EE27.name=suur reede
+holiday.et-EE27.date=20160325
+holiday.et-EE28.name=ülestõusmispühade 1. püha
+holiday.et-EE28.date=20160327
+holiday.et-EE29.name=kevadpüha
+holiday.et-EE29.date=20160501
+holiday.et-EE30.name=nelipühade 1. püha
+holiday.et-EE30.date=20160515
+holiday.et-EE31.name=võidupüha
+holiday.et-EE31.date=20160623
+holiday.et-EE32.name=jaanipäev
+holiday.et-EE32.date=20160624
+holiday.et-EE33.name=taasiseseisvumispäev
+holiday.et-EE33.date=20160820
+holiday.et-EE34.name=jõululaupäev
+holiday.et-EE34.date=20161224
+holiday.et-EE35.name=esimene jõulupüha
+holiday.et-EE35.date=20161225
+holiday.et-EE36.name=teine jõulupüha
+holiday.et-EE36.date=20161226
--- a/doc/rc/holidays.fi-FI.rc
+++ b/doc/rc/holidays.fi-FI.rc
@@ -0,0 +1,119 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/fi-FI/2014.json
+# http://holidata.net/fi-FI/2015.json
+#
+# Copyright 2006 - 2015, 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.fi-FI1.name=Uudenvuodenpäivä
+holiday.fi-FI1.date=20140101
+holiday.fi-FI2.name=Loppiainen
+holiday.fi-FI2.date=20140106
+holiday.fi-FI3.name=Pitkäperjantai
+holiday.fi-FI3.date=20140418
+holiday.fi-FI4.name=Pääsiäispäivä
+holiday.fi-FI4.date=20140420
+holiday.fi-FI5.name=2. pääsiäispäivä
+holiday.fi-FI5.date=20140421
+holiday.fi-FI6.name=Vappu
+holiday.fi-FI6.date=20140501
+holiday.fi-FI7.name=Helatorstai
+holiday.fi-FI7.date=20140529
+holiday.fi-FI8.name=Helluntaipäivä
+holiday.fi-FI8.date=20140608
+holiday.fi-FI9.name=Juhannusaatto
+holiday.fi-FI9.date=20140620
+holiday.fi-FI10.name=Juhannuspäivä
+holiday.fi-FI10.date=20140621
+holiday.fi-FI11.name=Pyhäinpäivä
+holiday.fi-FI11.date=20141101
+holiday.fi-FI12.name=Itsenäisyyspäivä
+holiday.fi-FI12.date=20141206
+holiday.fi-FI13.name=Jouluaatto
+holiday.fi-FI13.date=20141224
+holiday.fi-FI14.name=Joulupäivä
+holiday.fi-FI14.date=20141225
+holiday.fi-FI15.name=2. joulupäivä
+holiday.fi-FI15.date=20141226
+holiday.fi-FI16.name=Uudenvuodenpäivä
+holiday.fi-FI16.date=20150101
+holiday.fi-FI17.name=Loppiainen
+holiday.fi-FI17.date=20150106
+holiday.fi-FI18.name=Pitkäperjantai
+holiday.fi-FI18.date=20150403
+holiday.fi-FI19.name=Pääsiäispäivä
+holiday.fi-FI19.date=20150405
+holiday.fi-FI20.name=2. pääsiäispäivä
+holiday.fi-FI20.date=20150406
+holiday.fi-FI21.name=Vappu
+holiday.fi-FI21.date=20150501
+holiday.fi-FI22.name=Helatorstai
+holiday.fi-FI22.date=20150514
+holiday.fi-FI23.name=Helluntaipäivä
+holiday.fi-FI23.date=20150524
+holiday.fi-FI24.name=Juhannusaatto
+holiday.fi-FI24.date=20150619
+holiday.fi-FI25.name=Juhannuspäivä
+holiday.fi-FI25.date=20150620
+holiday.fi-FI26.name=Pyhäinpäivä
+holiday.fi-FI26.date=20151031
+holiday.fi-FI27.name=Itsenäisyyspäivä
+holiday.fi-FI27.date=20151206
+holiday.fi-FI28.name=Jouluaatto
+holiday.fi-FI28.date=20151224
+holiday.fi-FI29.name=Joulupäivä
+holiday.fi-FI29.date=20151225
+holiday.fi-FI30.name=2. joulupäivä
+holiday.fi-FI30.date=20151226
+holiday.fi-FI31.name=Uudenvuodenpäivä
+holiday.fi-FI31.date=20160101
+holiday.fi-FI32.name=Loppiainen
+holiday.fi-FI32.date=20160106
+holiday.fi-FI33.name=Pitkäperjantai
+holiday.fi-FI33.date=20160325
+holiday.fi-FI34.name=Pääsiäispäivä
+holiday.fi-FI34.date=20160327
+holiday.fi-FI35.name=2. pääsiäispäivä
+holiday.fi-FI35.date=20160328
+holiday.fi-FI36.name=Vappu
+holiday.fi-FI36.date=20160501
+holiday.fi-FI37.name=Helatorstai
+holiday.fi-FI37.date=20160505
+holiday.fi-FI38.name=Helluntaipäivä
+holiday.fi-FI38.date=20160515
+holiday.fi-FI39.name=Juhannusaatto
+holiday.fi-FI39.date=20160624
+holiday.fi-FI40.name=Juhannuspäivä
+holiday.fi-FI40.date=20160625
+holiday.fi-FI41.name=Pyhäinpäivä
+holiday.fi-FI41.date=20161105
+holiday.fi-FI42.name=Itsenäisyyspäivä
+holiday.fi-FI42.date=20161206
+holiday.fi-FI43.name=Jouluaatto
+holiday.fi-FI43.date=20161224
+holiday.fi-FI44.name=Joulupäivä
+holiday.fi-FI44.date=20161225
+holiday.fi-FI45.name=2. joulupäivä
+holiday.fi-FI45.date=20161226
--- a/doc/rc/holidays.fr-BE.rc
+++ b/doc/rc/holidays.fr-BE.rc
@@ -0,0 +1,101 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/fr-BE/2014.json
+# http://holidata.net/fr-BE/2015.json
+#
+# Copyright 2006 - 2015, 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.fr-BE1.name=Nouvel An
+holiday.fr-BE1.date=20140101
+holiday.fr-BE2.name=Pâques
+holiday.fr-BE2.date=20140420
+holiday.fr-BE3.name=Lundi de Pâques
+holiday.fr-BE3.date=20140421
+holiday.fr-BE4.name=Fête du Travail
+holiday.fr-BE4.date=20140501
+holiday.fr-BE5.name=Ascension
+holiday.fr-BE5.date=20140529
+holiday.fr-BE6.name=Pentecôte
+holiday.fr-BE6.date=20140608
+holiday.fr-BE7.name=Lundi de Pentecôte
+holiday.fr-BE7.date=20140609
+holiday.fr-BE8.name=Fête nationale
+holiday.fr-BE8.date=20140721
+holiday.fr-BE9.name=Assomption
+holiday.fr-BE9.date=20140815
+holiday.fr-BE10.name=Toussaint
+holiday.fr-BE10.date=20141101
+holiday.fr-BE11.name=Jour de l'armistice
+holiday.fr-BE11.date=20141111
+holiday.fr-BE12.name=Noël
+holiday.fr-BE12.date=20141225
+holiday.fr-BE13.name=Nouvel An
+holiday.fr-BE13.date=20150101
+holiday.fr-BE14.name=Pâques
+holiday.fr-BE14.date=20150405
+holiday.fr-BE15.name=Lundi de Pâques
+holiday.fr-BE15.date=20150406
+holiday.fr-BE16.name=Fête du Travail
+holiday.fr-BE16.date=20150501
+holiday.fr-BE17.name=Ascension
+holiday.fr-BE17.date=20150514
+holiday.fr-BE18.name=Pentecôte
+holiday.fr-BE18.date=20150524
+holiday.fr-BE19.name=Lundi de Pentecôte
+holiday.fr-BE19.date=20150525
+holiday.fr-BE20.name=Fête nationale
+holiday.fr-BE20.date=20150721
+holiday.fr-BE21.name=Assomption
+holiday.fr-BE21.date=20150815
+holiday.fr-BE22.name=Toussaint
+holiday.fr-BE22.date=20151101
+holiday.fr-BE23.name=Jour de l'armistice
+holiday.fr-BE23.date=20151111
+holiday.fr-BE24.name=Noël
+holiday.fr-BE24.date=20151225
+holiday.fr-BE25.name=Nouvel An
+holiday.fr-BE25.date=20160101
+holiday.fr-BE26.name=Pâques
+holiday.fr-BE26.date=20160527
+holiday.fr-BE27.name=Lundi de Pâques
+holiday.fr-BE27.date=20160528
+holiday.fr-BE28.name=Fête du Travail
+holiday.fr-BE28.date=20160501
+holiday.fr-BE29.name=Ascension
+holiday.fr-BE29.date=20160505
+holiday.fr-BE30.name=Pentecôte
+holiday.fr-BE30.date=20160515
+holiday.fr-BE31.name=Lundi de Pentecôte
+holiday.fr-BE31.date=20160516
+holiday.fr-BE32.name=Fête nationale
+holiday.fr-BE32.date=20160721
+holiday.fr-BE33.name=Assomption
+holiday.fr-BE33.date=20160815
+holiday.fr-BE34.name=Toussaint
+holiday.fr-BE34.date=20161101
+holiday.fr-BE35.name=Jour de l'armistice
+holiday.fr-BE35.date=20161111
+holiday.fr-BE36.name=Noël
+holiday.fr-BE36.date=20161225
--- a/doc/rc/holidays.fr-FR.rc
+++ b/doc/rc/holidays.fr-FR.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/fr-FR/2012.json
-# http://holidata.net/fr-FR/2013.json
+# http://holidata.net/fr-FR/2014.json
+# http://holidata.net/fr-FR/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,46 +28,68 @@
 ###############################################################################

 holiday.fr-FR1.name=Jour de l'an
-holiday.fr-FR1.date=20120101
+holiday.fr-FR1.date=20140101
 holiday.fr-FR2.name=Lundi de Pâques
-holiday.fr-FR2.date=20120409
+holiday.fr-FR2.date=20140421
 holiday.fr-FR3.name=Fête du premier mai
-holiday.fr-FR3.date=20120501
+holiday.fr-FR3.date=20140501
 holiday.fr-FR4.name=Armistice 1945
-holiday.fr-FR4.date=20120508
+holiday.fr-FR4.date=20140508
 holiday.fr-FR5.name=Ascencion
-holiday.fr-FR5.date=20120517
+holiday.fr-FR5.date=20140529
 holiday.fr-FR6.name=Pentecôte
-holiday.fr-FR6.date=20120528
+holiday.fr-FR6.date=20140608
 holiday.fr-FR7.name=Fête nationale
-holiday.fr-FR7.date=20120714
+holiday.fr-FR7.date=20140714
 holiday.fr-FR8.name=Assomption
-holiday.fr-FR8.date=20120815
+holiday.fr-FR8.date=20140815
 holiday.fr-FR9.name=Toussaint
-holiday.fr-FR9.date=20121101
+holiday.fr-FR9.date=20141101
 holiday.fr-FR10.name=Armistice 1918
-holiday.fr-FR10.date=20121111
+holiday.fr-FR10.date=20141111
 holiday.fr-FR11.name=Noël
-holiday.fr-FR11.date=20121225
+holiday.fr-FR11.date=20141225
 holiday.fr-FR12.name=Jour de l'an
-holiday.fr-FR12.date=20130101
+holiday.fr-FR12.date=20150101
 holiday.fr-FR13.name=Lundi de Pâques
-holiday.fr-FR13.date=20130401
+holiday.fr-FR13.date=20150406
 holiday.fr-FR14.name=Fête du premier mai
-holiday.fr-FR14.date=20130501
+holiday.fr-FR14.date=20150501
 holiday.fr-FR15.name=Armistice 1945
-holiday.fr-FR15.date=20130508
+holiday.fr-FR15.date=20150508
 holiday.fr-FR16.name=Ascencion
-holiday.fr-FR16.date=20130509
+holiday.fr-FR16.date=20150514
 holiday.fr-FR17.name=Pentecôte
-holiday.fr-FR17.date=20130519
+holiday.fr-FR17.date=20150524
 holiday.fr-FR18.name=Fête nationale
-holiday.fr-FR18.date=20130714
+holiday.fr-FR18.date=20150714
 holiday.fr-FR19.name=Assomption
-holiday.fr-FR19.date=20130815
+holiday.fr-FR19.date=20150815
 holiday.fr-FR20.name=Toussaint
-holiday.fr-FR20.date=20131101
+holiday.fr-FR20.date=20151101
 holiday.fr-FR21.name=Armistice 1918
-holiday.fr-FR21.date=20131111
+holiday.fr-FR21.date=20151111
 holiday.fr-FR22.name=Noël
-holiday.fr-FR22.date=20131225
+holiday.fr-FR22.date=20151225
+holiday.fr-FR23.name=Jour de l'an
+holiday.fr-FR23.date=20160101
+holiday.fr-FR24.name=Lundi de Pâques
+holiday.fr-FR24.date=20160328
+holiday.fr-FR25.name=Fête du premier mai
+holiday.fr-FR25.date=20160501
+holiday.fr-FR26.name=Armistice 1945
+holiday.fr-FR26.date=20160508
+holiday.fr-FR27.name=Ascencion
+holiday.fr-FR27.date=20160505
+holiday.fr-FR28.name=Pentecôte
+holiday.fr-FR28.date=20160515
+holiday.fr-FR29.name=Fête nationale
+holiday.fr-FR29.date=20160714
+holiday.fr-FR30.name=Assomption
+holiday.fr-FR30.date=20160815
+holiday.fr-FR31.name=Toussaint
+holiday.fr-FR31.date=20161101
+holiday.fr-FR32.name=Armistice 1918
+holiday.fr-FR32.date=20161111
+holiday.fr-FR33.name=Noël
+holiday.fr-FR33.date=20161225
--- a/doc/rc/holidays.ga-IE.rc
+++ b/doc/rc/holidays.ga-IE.rc
@@ -0,0 +1,83 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/ga-IE/2014.json
+# http://holidata.net/ga-IE/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.ga-IE2.name=Lá Fhéile Pádraig
+holiday.ga-IE2.date=20140317
+holiday.ga-IE3.name=Luan Cásca
+holiday.ga-IE3.date=20140421
+holiday.ga-IE4.name=Lá an Lucht Oibre
+holiday.ga-IE4.date=20140505
+holiday.ga-IE5.name=Lá Saoire i mí Mheitheamh
+holiday.ga-IE5.date=20140602
+holiday.ga-IE6.name=Lá Saoire i mí Lúnasa
+holiday.ga-IE6.date=20140804
+holiday.ga-IE7.name=Lá Saoire i mí Dheireadh Fómhair
+holiday.ga-IE7.date=20141027
+holiday.ga-IE8.name=Lá Nollag
+holiday.ga-IE8.date=20141225
+holiday.ga-IE9.name=Lá Fhéile Stiofáin or Lá an Dreoilín
+holiday.ga-IE9.date=20141226
+holiday.ga-IE10.name=Lá Caille or Lá Bliana Nua
+holiday.ga-IE10.date=20150101
+holiday.ga-IE11.name=Lá Fhéile Pádraig
+holiday.ga-IE11.date=20150317
+holiday.ga-IE12.name=Luan Cásca
+holiday.ga-IE12.date=20150406
+holiday.ga-IE13.name=Lá an Lucht Oibre
+holiday.ga-IE13.date=20150504
+holiday.ga-IE14.name=Lá Saoire i mí Mheitheamh
+holiday.ga-IE14.date=20150601
+holiday.ga-IE15.name=Lá Saoire i mí Lúnasa
+holiday.ga-IE15.date=20150803
+holiday.ga-IE16.name=Lá Saoire i mí Dheireadh Fómhair
+holiday.ga-IE16.date=20151026
+holiday.ga-IE17.name=Lá Nollag
+holiday.ga-IE17.date=20151225
+holiday.ga-IE18.name=Lá Fhéile Stiofáin or Lá an Dreoilín
+holiday.ga-IE18.date=20151226
+holiday.ga-IE19.name=Lá Caille or Lá Bliana Nua
+holiday.ga-IE19.date=20160101
+holiday.ga-IE20.name=Lá Fhéile Pádraig
+holiday.ga-IE20.date=20160317
+holiday.ga-IE21.name=Luan Cásca
+holiday.ga-IE21.date=20160328
+holiday.ga-IE22.name=Lá an Lucht Oibre
+holiday.ga-IE22.date=20160502
+holiday.ga-IE23.name=Lá Saoire i mí Mheitheamh
+holiday.ga-IE23.date=20160606
+holiday.ga-IE24.name=Lá Saoire i mí Lúnasa
+holiday.ga-IE24.date=20160801
+holiday.ga-IE25.name=Lá Saoire i mí Dheireadh Fómhair
+holiday.ga-IE25.date=20161031
+holiday.ga-IE26.name=Lá Nollag
+holiday.ga-IE26.date=20161225
+holiday.ga-IE27.name=Lá Fhéile Stiofáin or Lá an Dreoilín
+holiday.ga-IE27.date=20161226
--- a/doc/rc/holidays.hr-HR.rc
+++ b/doc/rc/holidays.hr-HR.rc
@@ -0,0 +1,113 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/hr-HR/2014.json
+# http://holidata.net/hr-HR/2015.json
+#
+# Copyright 2006 - 2015, 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.hr-HR1.name=Nova Godina
+holiday.hr-HR1.date=20140101
+holiday.hr-HR2.name=Bogojavljenje
+holiday.hr-HR2.date=20140106
+holiday.hr-HR3.name=Uskrs
+holiday.hr-HR3.date=20140420
+holiday.hr-HR4.name=Uskrsni ponedjeljak
+holiday.hr-HR4.date=20140421
+holiday.hr-HR5.name=Međunarodni praznik rada
+holiday.hr-HR5.date=20140501
+holiday.hr-HR6.name=Tijelovo
+holiday.hr-HR6.date=20140619
+holiday.hr-HR7.name=Dan antifašističke borbe
+holiday.hr-HR7.date=20140622
+holiday.hr-HR8.name=Dan državnosti
+holiday.hr-HR8.date=20140625
+holiday.hr-HR9.name=Dan pobjede
+holiday.hr-HR9.date=20140805
+holiday.hr-HR10.name=Velika Gospa
+holiday.hr-HR10.date=20140815
+holiday.hr-HR11.name=Dan neovisnosti
+holiday.hr-HR11.date=20141008
+holiday.hr-HR12.name=Dan svih svetih
+holiday.hr-HR12.date=20141101
+holiday.hr-HR13.name=Božić
+holiday.hr-HR13.date=20141225
+holiday.hr-HR14.name=Prvi dan po Božiću
+holiday.hr-HR14.date=20141226
+holiday.hr-HR15.name=Nova Godina
+holiday.hr-HR15.date=20150101
+holiday.hr-HR16.name=Bogojavljenje
+holiday.hr-HR16.date=20150106
+holiday.hr-HR17.name=Uskrs
+holiday.hr-HR17.date=20150405
+holiday.hr-HR18.name=Uskrsni ponedjeljak
+holiday.hr-HR18.date=20150406
+holiday.hr-HR19.name=Međunarodni praznik rada
+holiday.hr-HR19.date=20150501
+holiday.hr-HR20.name=Tijelovo
+holiday.hr-HR20.date=20150604
+holiday.hr-HR21.name=Dan antifašističke borbe
+holiday.hr-HR21.date=20150622
+holiday.hr-HR22.name=Dan državnosti
+holiday.hr-HR22.date=20150625
+holiday.hr-HR23.name=Dan pobjede
+holiday.hr-HR23.date=20150805
+holiday.hr-HR24.name=Velika Gospa
+holiday.hr-HR24.date=20150815
+holiday.hr-HR25.name=Dan neovisnosti
+holiday.hr-HR25.date=20151008
+holiday.hr-HR26.name=Dan svih svetih
+holiday.hr-HR26.date=20151101
+holiday.hr-HR27.name=Božić
+holiday.hr-HR27.date=20151225
+holiday.hr-HR28.name=Prvi dan po Božiću
+holiday.hr-HR28.date=20151226
+holiday.hr-HR29.name=Nova Godina
+holiday.hr-HR29.date=20160101
+holiday.hr-HR30.name=Bogojavljenje
+holiday.hr-HR30.date=20160106
+holiday.hr-HR31.name=Uskrs
+holiday.hr-HR31.date=20160327
+holiday.hr-HR32.name=Uskrsni ponedjeljak
+holiday.hr-HR32.date=20160328
+holiday.hr-HR33.name=Međunarodni praznik rada
+holiday.hr-HR33.date=20160501
+holiday.hr-HR34.name=Tijelovo
+holiday.hr-HR34.date=20160526
+holiday.hr-HR35.name=Dan antifašističke borbe
+holiday.hr-HR35.date=20160622
+holiday.hr-HR36.name=Dan državnosti
+holiday.hr-HR36.date=20160625
+holiday.hr-HR37.name=Dan pobjede
+holiday.hr-HR37.date=20160805
+holiday.hr-HR38.name=Velika Gospa
+holiday.hr-HR38.date=20160815
+holiday.hr-HR39.name=Dan neovisnosti
+holiday.hr-HR39.date=20161008
+holiday.hr-HR40.name=Dan svih svetih
+holiday.hr-HR40.date=20161101
+holiday.hr-HR41.name=Božić
+holiday.hr-HR41.date=20161225
+holiday.hr-HR42.name=Prvi dan po Božiću
+holiday.hr-HR42.date=20161226
--- a/doc/rc/holidays.is-IS.rc
+++ b/doc/rc/holidays.is-IS.rc
@@ -0,0 +1,119 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/is-IS/2014.json
+# http://holidata.net/is-IS/2015.json
+#
+# Copyright 2006 - 2015, 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.is-IS1.name=Nýársdagur
+holiday.is-IS1.date=20140101
+holiday.is-IS2.name=Skírdagur
+holiday.is-IS2.date=20140417
+holiday.is-IS3.name=Föstudaginn langi
+holiday.is-IS3.date=20140418
+holiday.is-IS4.name=Páskadagur
+holiday.is-IS4.date=20140420
+holiday.is-IS5.name=Annar í páskum
+holiday.is-IS5.date=20140421
+holiday.is-IS6.name=Sumardagurinn fyrsti
+holiday.is-IS6.date=20140424
+holiday.is-IS7.name=Verkalýðsdagurinn
+holiday.is-IS7.date=20140501
+holiday.is-IS8.name=Uppstigningardagur
+holiday.is-IS8.date=20140529
+holiday.is-IS9.name=Annar í hvítasunnu
+holiday.is-IS9.date=20140609
+holiday.is-IS10.name=Lýðveldisdagurinn
+holiday.is-IS10.date=20140617
+holiday.is-IS11.name=Frídagur verslunarmanna
+holiday.is-IS11.date=20140804
+holiday.is-IS12.name=Jól
+holiday.is-IS12.date=20141224
+holiday.is-IS13.name=Jól
+holiday.is-IS13.date=20141225
+holiday.is-IS14.name=Jól
+holiday.is-IS14.date=20141226
+holiday.is-IS15.name=Gamlárskvöld
+holiday.is-IS15.date=20141231
+holiday.is-IS16.name=Nýársdagur
+holiday.is-IS16.date=20150101
+holiday.is-IS17.name=Skírdagur
+holiday.is-IS17.date=20150402
+holiday.is-IS18.name=Föstudaginn langi
+holiday.is-IS18.date=20150403
+holiday.is-IS19.name=Páskadagur
+holiday.is-IS19.date=20150405
+holiday.is-IS20.name=Annar í páskum
+holiday.is-IS20.date=20150406
+holiday.is-IS21.name=Sumardagurinn fyrsti
+holiday.is-IS21.date=20150423
+holiday.is-IS22.name=Verkalýðsdagurinn
+holiday.is-IS22.date=20150501
+holiday.is-IS23.name=Uppstigningardagur
+holiday.is-IS23.date=20150514
+holiday.is-IS24.name=Annar í hvítasunnu
+holiday.is-IS24.date=20150525
+holiday.is-IS25.name=Lýðveldisdagurinn
+holiday.is-IS25.date=20150617
+holiday.is-IS26.name=Frídagur verslunarmanna
+holiday.is-IS26.date=20150803
+holiday.is-IS27.name=Jól
+holiday.is-IS27.date=20151224
+holiday.is-IS28.name=Jól
+holiday.is-IS28.date=20151225
+holiday.is-IS29.name=Jól
+holiday.is-IS29.date=20151226
+holiday.is-IS30.name=Gamlárskvöld
+holiday.is-IS30.date=20151231
+holiday.is-IS31.name=Nýársdagur
+holiday.is-IS31.date=20160101
+holiday.is-IS32.name=Skírdagur
+holiday.is-IS32.date=20160324
+holiday.is-IS33.name=Föstudaginn langi
+holiday.is-IS33.date=20160325
+holiday.is-IS34.name=Páskadagur
+holiday.is-IS34.date=20160327
+holiday.is-IS35.name=Annar í páskum
+holiday.is-IS35.date=20160328
+holiday.is-IS36.name=Sumardagurinn fyrsti
+holiday.is-IS36.date=20160421
+holiday.is-IS37.name=Verkalýðsdagurinn
+holiday.is-IS37.date=20160501
+holiday.is-IS38.name=Uppstigningardagur
+holiday.is-IS38.date=20160505
+holiday.is-IS39.name=Annar í hvítasunnu
+holiday.is-IS39.date=20160516
+holiday.is-IS40.name=Lýðveldisdagurinn
+holiday.is-IS40.date=20160617
+holiday.is-IS41.name=Frídagur verslunarmanna
+holiday.is-IS41.date=20160801
+holiday.is-IS42.name=Jól
+holiday.is-IS42.date=20161224
+holiday.is-IS43.name=Jól
+holiday.is-IS43.date=20161225
+holiday.is-IS44.name=Jól
+holiday.is-IS44.date=20161226
+holiday.is-IS45.name=Gamlárskvöld
+holiday.is-IS45.date=20161231
--- 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/2012.json
-# http://holidata.net/it-IT/2013.json
+# http://holidata.net/it-IT/2014.json
+# http://holidata.net/it-IT/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,50 +28,74 @@
 ###############################################################################

 holiday.it-IT1.name=Capodanno
-holiday.it-IT1.date=20120101
+holiday.it-IT1.date=20140101
 holiday.it-IT2.name=Epifania
-holiday.it-IT2.date=20120106
+holiday.it-IT2.date=20140106
 holiday.it-IT3.name=Carnevale
-holiday.it-IT3.date=20120308
+holiday.it-IT3.date=20140304
 holiday.it-IT4.name=Pasqua
-holiday.it-IT4.date=20120409
+holiday.it-IT4.date=20140420
 holiday.it-IT5.name=Festa della liberazione
-holiday.it-IT5.date=20120425
+holiday.it-IT5.date=20140425
 holiday.it-IT6.name=Festa del lavoro
-holiday.it-IT6.date=20120501
+holiday.it-IT6.date=20140501
 holiday.it-IT7.name=Festa della repubblica
-holiday.it-IT7.date=20120602
+holiday.it-IT7.date=20140602
 holiday.it-IT8.name=Assunzione (ferragosto)
-holiday.it-IT8.date=20120815
+holiday.it-IT8.date=20140815
 holiday.it-IT9.name=Ognissanti
-holiday.it-IT9.date=20121101
+holiday.it-IT9.date=20141101
 holiday.it-IT10.name=Immacolata concezione
-holiday.it-IT10.date=20121208
+holiday.it-IT10.date=20141208
 holiday.it-IT11.name=Natale
-holiday.it-IT11.date=20121225
+holiday.it-IT11.date=20141225
 holiday.it-IT12.name=S.to Stefano
-holiday.it-IT12.date=20121226
+holiday.it-IT12.date=20141226
 holiday.it-IT13.name=Capodanno
-holiday.it-IT13.date=20130101
+holiday.it-IT13.date=20150101
 holiday.it-IT14.name=Epifania
-holiday.it-IT14.date=20130106
+holiday.it-IT14.date=20150106
 holiday.it-IT15.name=Carnevale
-holiday.it-IT15.date=20130210
+holiday.it-IT15.date=20150217
 holiday.it-IT16.name=Pasqua
-holiday.it-IT16.date=20130401
+holiday.it-IT16.date=20150405
 holiday.it-IT17.name=Festa della liberazione
-holiday.it-IT17.date=20130425
+holiday.it-IT17.date=20150425
 holiday.it-IT18.name=Festa del lavoro
-holiday.it-IT18.date=20130501
+holiday.it-IT18.date=20150501
 holiday.it-IT19.name=Festa della repubblica
-holiday.it-IT19.date=20130602
+holiday.it-IT19.date=20150602
 holiday.it-IT20.name=Assunzione (ferragosto)
-holiday.it-IT20.date=20130815
+holiday.it-IT20.date=20150815
 holiday.it-IT21.name=Ognissanti
-holiday.it-IT21.date=20131101
+holiday.it-IT21.date=20151101
 holiday.it-IT22.name=Immacolata concezione
-holiday.it-IT22.date=20131208
+holiday.it-IT22.date=20151208
 holiday.it-IT23.name=Natale
-holiday.it-IT23.date=20131225
+holiday.it-IT23.date=20151225
 holiday.it-IT24.name=S.to Stefano
-holiday.it-IT24.date=20131226
+holiday.it-IT24.date=20151226
+holiday.it-IT25.name=Capodanno
+holiday.it-IT25.date=20160101
+holiday.it-IT26.name=Epifania
+holiday.it-IT26.date=20160106
+holiday.it-IT27.name=Carnevale
+holiday.it-IT27.date=20160209
+holiday.it-IT28.name=Pasqua
+holiday.it-IT28.date=20160327
+holiday.it-IT29.name=Festa della liberazione
+holiday.it-IT29.date=20160425
+holiday.it-IT30.name=Festa del lavoro
+holiday.it-IT30.date=20160501
+holiday.it-IT31.name=Festa della repubblica
+holiday.it-IT31.date=20160602
+holiday.it-IT32.name=Assunzione (ferragosto)
+holiday.it-IT32.date=20160815
+holiday.it-IT33.name=Ognissanti
+holiday.it-IT33.date=20161101
+holiday.it-IT34.name=Immacolata concezione
+holiday.it-IT34.date=20161208
+holiday.it-IT35.name=Natale
+holiday.it-IT35.date=20161225
+holiday.it-IT36.name=S.to Stefano
+holiday.it-IT36.date=20161226
--- a/doc/rc/holidays.jp-JP.rc
+++ b/doc/rc/holidays.jp-JP.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/jp-JP/2012.json
-# http://holidata.net/jp-JP/2013.json
+# http://holidata.net/jp-JP/2014.json
+# http://holidata.net/jp-JP/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,72 +28,96 @@
 ###############################################################################

 holiday.jp-JP1.name=元日
-holiday.jp-JP1.date=20120101
-holiday.jp-JP2.name=振替休日
-holiday.jp-JP2.date=20120102
-holiday.jp-JP3.name=成人の日
-holiday.jp-JP3.date=20120109
-holiday.jp-JP4.name=建国記念の日
-holiday.jp-JP4.date=20120211
-holiday.jp-JP5.name=春分の日
-holiday.jp-JP5.date=20120320
-holiday.jp-JP6.name=昭和の日
-holiday.jp-JP6.date=20120429
-holiday.jp-JP7.name=振替休日
-holiday.jp-JP7.date=20120430
-holiday.jp-JP8.name=憲法記念日
-holiday.jp-JP8.date=20120503
-holiday.jp-JP9.name=みどりの日
-holiday.jp-JP9.date=20120504
-holiday.jp-JP10.name=こどもの日
-holiday.jp-JP10.date=20120505
-holiday.jp-JP11.name=海の日
-holiday.jp-JP11.date=20120716
-holiday.jp-JP12.name=敬老の日
-holiday.jp-JP12.date=20120917
-holiday.jp-JP13.name=秋分の日
-holiday.jp-JP13.date=20120922
-holiday.jp-JP14.name=体育の日
-holiday.jp-JP14.date=20121008
-holiday.jp-JP15.name=文化の日
-holiday.jp-JP15.date=20121103
-holiday.jp-JP16.name=勤労感謝の日
-holiday.jp-JP16.date=20121123
-holiday.jp-JP17.name=天皇誕生日
-holiday.jp-JP17.date=20121223
-holiday.jp-JP18.name=振替休日
-holiday.jp-JP18.date=20121224
-holiday.jp-JP19.name=元日
-holiday.jp-JP19.date=20130101
-holiday.jp-JP20.name=成人の日
-holiday.jp-JP20.date=20130114
-holiday.jp-JP21.name=建国記念の日
-holiday.jp-JP21.date=20130211
-holiday.jp-JP22.name=春分の日
-holiday.jp-JP22.date=20130320
-holiday.jp-JP23.name=昭和の日
-holiday.jp-JP23.date=20130429
-holiday.jp-JP24.name=憲法記念日
-holiday.jp-JP24.date=20130503
-holiday.jp-JP25.name=みどりの日
-holiday.jp-JP25.date=20130504
-holiday.jp-JP26.name=こどもの日
-holiday.jp-JP26.date=20130505
-holiday.jp-JP27.name=振替休日
-holiday.jp-JP27.date=20130506
-holiday.jp-JP28.name=海の日
-holiday.jp-JP28.date=20130715
-holiday.jp-JP29.name=敬老の日
-holiday.jp-JP29.date=20130919
-holiday.jp-JP30.name=秋分の日
-holiday.jp-JP30.date=20130923
-holiday.jp-JP31.name=体育の日
-holiday.jp-JP31.date=20131014
-holiday.jp-JP32.name=文化の日
-holiday.jp-JP32.date=20131103
-holiday.jp-JP33.name=振替休日
-holiday.jp-JP33.date=20131104
-holiday.jp-JP34.name=勤労感謝の日
-holiday.jp-JP34.date=20131123
-holiday.jp-JP35.name=天皇誕生日
-holiday.jp-JP35.date=20131223
+holiday.jp-JP1.date=20140101
+holiday.jp-JP2.name=成人の日
+holiday.jp-JP2.date=20140113
+holiday.jp-JP3.name=建国記念の日
+holiday.jp-JP3.date=20140211
+holiday.jp-JP4.name=春分の日
+holiday.jp-JP4.date=20140321
+holiday.jp-JP5.name=昭和の日
+holiday.jp-JP5.date=20140429
+holiday.jp-JP6.name=憲法記念日
+holiday.jp-JP6.date=20140503
+holiday.jp-JP7.name=みどりの日
+holiday.jp-JP7.date=20140504
+holiday.jp-JP8.name=こどもの日
+holiday.jp-JP8.date=20140505
+holiday.jp-JP9.name=振替休日
+holiday.jp-JP9.date=20140506
+holiday.jp-JP10.name=海の日
+holiday.jp-JP10.date=20140721
+holiday.jp-JP11.name=敬老の日
+holiday.jp-JP11.date=20140915
+holiday.jp-JP12.name=秋分の日
+holiday.jp-JP12.date=20140923
+holiday.jp-JP13.name=体育の日
+holiday.jp-JP13.date=20141013
+holiday.jp-JP14.name=文化の日
+holiday.jp-JP14.date=20141103
+holiday.jp-JP15.name=勤労感謝の日
+holiday.jp-JP15.date=20141124
+holiday.jp-JP16.name=天皇誕生日
+holiday.jp-JP16.date=20141223
+holiday.jp-JP17.name=元日
+holiday.jp-JP17.date=20150101
+holiday.jp-JP18.name=成人の日
+holiday.jp-JP18.date=20150112
+holiday.jp-JP19.name=建国記念の日
+holiday.jp-JP19.date=20150211
+holiday.jp-JP20.name=春分の日
+holiday.jp-JP20.date=20150321
+holiday.jp-JP21.name=昭和の日
+holiday.jp-JP21.date=20150429
+holiday.jp-JP22.name=憲法記念日
+holiday.jp-JP22.date=20150503
+holiday.jp-JP23.name=みどりの日
+holiday.jp-JP23.date=20150504
+holiday.jp-JP24.name=こどもの日
+holiday.jp-JP24.date=20150505
+holiday.jp-JP25.name=振替休日
+holiday.jp-JP25.date=20150506
+holiday.jp-JP26.name=海の日
+holiday.jp-JP26.date=20150720
+holiday.jp-JP27.name=敬老の日
+holiday.jp-JP27.date=20150921
+holiday.jp-JP28.name=秋分の日
+holiday.jp-JP28.date=20150923
+holiday.jp-JP29.name=体育の日
+holiday.jp-JP29.date=20151012
+holiday.jp-JP30.name=文化の日
+holiday.jp-JP30.date=20151103
+holiday.jp-JP31.name=勤労感謝の日
+holiday.jp-JP31.date=20151123
+holiday.jp-JP32.name=天皇誕生日
+holiday.jp-JP32.date=20151223
+holiday.jp-JP33.name=元日
+holiday.jp-JP33.date=20160101
+holiday.jp-JP34.name=成人の日
+holiday.jp-JP34.date=20160111
+holiday.jp-JP35.name=建国記念の日
+holiday.jp-JP35.date=20160211
+holiday.jp-JP36.name=春分の日
+holiday.jp-JP36.date=20160321
+holiday.jp-JP37.name=昭和の日
+holiday.jp-JP37.date=20160429
+holiday.jp-JP38.name=憲法記念日
+holiday.jp-JP38.date=20160503
+holiday.jp-JP39.name=みどりの日
+holiday.jp-JP39.date=20160504
+holiday.jp-JP40.name=こどもの日
+holiday.jp-JP40.date=20160505
+holiday.jp-JP41.name=海の日
+holiday.jp-JP41.date=20160718
+holiday.jp-JP42.name=敬老の日
+holiday.jp-JP42.date=20160919
+holiday.jp-JP43.name=秋分の日
+holiday.jp-JP43.date=20160922
+holiday.jp-JP44.name=体育の日
+holiday.jp-JP44.date=20161010
+holiday.jp-JP45.name=文化の日
+holiday.jp-JP45.date=20161103
+holiday.jp-JP46.name=勤労感謝の日
+holiday.jp-JP46.date=20161123
+holiday.jp-JP47.name=天皇誕生日
+holiday.jp-JP47.date=20161223
--- a/doc/rc/holidays.lt-LT.rc
+++ b/doc/rc/holidays.lt-LT.rc
@@ -0,0 +1,107 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/lt-LT/2014.json
+# http://holidata.net/lt-LT/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.lt-LT2.name=Lietuvos valstybės atkūrimo diena
+holiday.lt-LT2.date=20140216
+holiday.lt-LT3.name=Lietuvos nepriklausomybės atkūrimo diena
+holiday.lt-LT3.date=20140311
+holiday.lt-LT4.name=Velykos
+holiday.lt-LT4.date=20140420
+holiday.lt-LT5.name=Velykos
+holiday.lt-LT5.date=20140421
+holiday.lt-LT6.name=Tarptautinė darbo diena
+holiday.lt-LT6.date=20140501
+holiday.lt-LT7.name=Joninės, Rasos
+holiday.lt-LT7.date=20140624
+holiday.lt-LT8.name=Valstybės diena
+holiday.lt-LT8.date=20140706
+holiday.lt-LT9.name=Žolinė
+holiday.lt-LT9.date=20140815
+holiday.lt-LT10.name=Visų šventųjų diena
+holiday.lt-LT10.date=20142101
+holiday.lt-LT11.name=Šv. Kalėdos
+holiday.lt-LT11.date=20141224
+holiday.lt-LT12.name=Šv. Kalėdos
+holiday.lt-LT12.date=20141225
+holiday.lt-LT13.name=Šv. Kalėdos
+holiday.lt-LT13.date=20141226
+holiday.lt-LT14.name=Naujieji metai
+holiday.lt-LT14.date=20150101
+holiday.lt-LT15.name=Lietuvos valstybės atkūrimo diena
+holiday.lt-LT15.date=20150216
+holiday.lt-LT16.name=Lietuvos nepriklausomybės atkūrimo diena
+holiday.lt-LT16.date=20150311
+holiday.lt-LT17.name=Velykos
+holiday.lt-LT17.date=20150405
+holiday.lt-LT18.name=Velykos
+holiday.lt-LT18.date=20150406
+holiday.lt-LT19.name=Tarptautinė darbo diena
+holiday.lt-LT19.date=20150501
+holiday.lt-LT20.name=Joninės, Rasos
+holiday.lt-LT20.date=20150624
+holiday.lt-LT21.name=Valstybės diena
+holiday.lt-LT21.date=20150706
+holiday.lt-LT22.name=Žolinė
+holiday.lt-LT22.date=20150815
+holiday.lt-LT23.name=Visų šventųjų diena
+holiday.lt-LT23.date=20152101
+holiday.lt-LT24.name=Šv. Kalėdos
+holiday.lt-LT24.date=20151224
+holiday.lt-LT25.name=Šv. Kalėdos
+holiday.lt-LT25.date=20151225
+holiday.lt-LT26.name=Šv. Kalėdos
+holiday.lt-LT26.date=20151226
+holiday.lt-LT27.name=Naujieji metai
+holiday.lt-LT27.date=20160101
+holiday.lt-LT28.name=Lietuvos valstybės atkūrimo diena
+holiday.lt-LT28.date=20160216
+holiday.lt-LT29.name=Lietuvos nepriklausomybės atkūrimo diena
+holiday.lt-LT29.date=20160311
+holiday.lt-LT30.name=Velykos
+holiday.lt-LT30.date=20160327
+holiday.lt-LT31.name=Velykos
+holiday.lt-LT31.date=20160328
+holiday.lt-LT32.name=Tarptautinė darbo diena
+holiday.lt-LT32.date=20160501
+holiday.lt-LT33.name=Joninės, Rasos
+holiday.lt-LT33.date=20160624
+holiday.lt-LT34.name=Valstybės diena
+holiday.lt-LT34.date=20160706
+holiday.lt-LT35.name=Žolinė
+holiday.lt-LT35.date=20160815
+holiday.lt-LT36.name=Visų šventųjų diena
+holiday.lt-LT36.date=20162101
+holiday.lt-LT37.name=Šv. Kalėdos
+holiday.lt-LT37.date=20161224
+holiday.lt-LT38.name=Šv. Kalėdos
+holiday.lt-LT38.date=20161225
+holiday.lt-LT39.name=Šv. Kalėdos
+holiday.lt-LT39.date=20161226
--- a/doc/rc/holidays.lv-LV.rc
+++ b/doc/rc/holidays.lv-LV.rc
@@ -0,0 +1,101 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/lv-LV/2014.json
+# http://holidata.net/lv-LV/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.lv-LV2.name=Lielā Piektdiena
+holiday.lv-LV2.date=20140418
+holiday.lv-LV3.name=Lieldienas
+holiday.lv-LV3.date=20140420
+holiday.lv-LV4.name=2. Lieldienas
+holiday.lv-LV4.date=20140421
+holiday.lv-LV5.name=Darba svētki
+holiday.lv-LV5.date=20140501
+holiday.lv-LV6.name=Latvijas Republikas Neatkarības atjaunošanas dienu
+holiday.lv-LV6.date=20140505
+holiday.lv-LV7.name=Jāņi
+holiday.lv-LV7.date=20140624
+holiday.lv-LV8.name=Latvijas Republikas proklamēšanas diena
+holiday.lv-LV8.date=20141118
+holiday.lv-LV9.name=Ziemassvētku vakars
+holiday.lv-LV9.date=20141224
+holiday.lv-LV10.name=Ziemassvētki
+holiday.lv-LV10.date=20141225
+holiday.lv-LV11.name=2. Ziemassvētki
+holiday.lv-LV11.date=20141226
+holiday.lv-LV12.name=Vecgada vakars
+holiday.lv-LV12.date=20141231
+holiday.lv-LV13.name=Jaunais Gads
+holiday.lv-LV13.date=20150101
+holiday.lv-LV14.name=Lielā Piektdiena
+holiday.lv-LV14.date=20150403
+holiday.lv-LV15.name=Lieldienas
+holiday.lv-LV15.date=20150405
+holiday.lv-LV16.name=2. Lieldienas
+holiday.lv-LV16.date=20150406
+holiday.lv-LV17.name=Darba svētki
+holiday.lv-LV17.date=20150501
+holiday.lv-LV18.name=Latvijas Republikas Neatkarības atjaunošanas dienu
+holiday.lv-LV18.date=20150505
+holiday.lv-LV19.name=Jāņi
+holiday.lv-LV19.date=20150624
+holiday.lv-LV20.name=Latvijas Republikas proklamēšanas diena
+holiday.lv-LV20.date=20151118
+holiday.lv-LV21.name=Ziemassvētku vakars
+holiday.lv-LV21.date=20151224
+holiday.lv-LV22.name=Ziemassvētki
+holiday.lv-LV22.date=20151225
+holiday.lv-LV23.name=2. Ziemassvētki
+holiday.lv-LV23.date=20151226
+holiday.lv-LV24.name=Vecgada vakars
+holiday.lv-LV24.date=20151231
+holiday.lv-LV25.name=Jaunais Gads
+holiday.lv-LV25.date=20160101
+holiday.lv-LV26.name=Lielā Piektdiena
+holiday.lv-LV26.date=20160325
+holiday.lv-LV27.name=Lieldienas
+holiday.lv-LV27.date=20160327
+holiday.lv-LV28.name=2. Lieldienas
+holiday.lv-LV28.date=20160327
+holiday.lv-LV29.name=Darba svētki
+holiday.lv-LV29.date=20160501
+holiday.lv-LV30.name=Latvijas Republikas Neatkarības atjaunošanas dienu
+holiday.lv-LV30.date=20160505
+holiday.lv-LV31.name=Jāņi
+holiday.lv-LV31.date=20160624
+holiday.lv-LV32.name=Latvijas Republikas proklamēšanas diena
+holiday.lv-LV32.date=20161118
+holiday.lv-LV33.name=Ziemassvētku vakars
+holiday.lv-LV33.date=20161224
+holiday.lv-LV34.name=Ziemassvētki
+holiday.lv-LV34.date=20161225
+holiday.lv-LV35.name=2. Ziemassvētki
+holiday.lv-LV35.date=20161226
+holiday.lv-LV36.name=Vecgada vakars
+holiday.lv-LV36.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/2012.json
-# http://holidata.net/nb-NO/2013.json
+# http://holidata.net/nb-NO/2014.json
+# http://holidata.net/nb-NO/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,70 +28,104 @@
 ###############################################################################

 holiday.nb-NO1.name=Nyttårsdag
-holiday.nb-NO1.date=20120101
+holiday.nb-NO1.date=20140101
 holiday.nb-NO2.name=Fastelavn
-holiday.nb-NO2.date=20120219
+holiday.nb-NO2.date=20140302
 holiday.nb-NO3.name=Palmesøndag
-holiday.nb-NO3.date=20120401
+holiday.nb-NO3.date=20140413
 holiday.nb-NO4.name=Skjærtorsdag
-holiday.nb-NO4.date=20120405
+holiday.nb-NO4.date=20140417
 holiday.nb-NO5.name=Langfredag
-holiday.nb-NO5.date=20120406
+holiday.nb-NO5.date=20140418
 holiday.nb-NO6.name=Påskedag
-holiday.nb-NO6.date=20120408
+holiday.nb-NO6.date=20140420
 holiday.nb-NO7.name=Påskedag
-holiday.nb-NO7.date=20120409
+holiday.nb-NO7.date=20140421
 holiday.nb-NO8.name=Offentlig Høytidsdag
-holiday.nb-NO8.date=20120501
+holiday.nb-NO8.date=20140501
 holiday.nb-NO9.name=Frigjøringsdag 1945
-holiday.nb-NO9.date=20120508
+holiday.nb-NO9.date=20140508
 holiday.nb-NO10.name=Grunnlovsdag
-holiday.nb-NO10.date=20120517
+holiday.nb-NO10.date=20140517
 holiday.nb-NO11.name=Kristi Himmelfartsdag
-holiday.nb-NO11.date=20120517
+holiday.nb-NO11.date=20140529
 holiday.nb-NO12.name=Pinsedag
-holiday.nb-NO12.date=20120527
+holiday.nb-NO12.date=20140608
 holiday.nb-NO13.name=Pinsedag
-holiday.nb-NO13.date=20120528
+holiday.nb-NO13.date=20140609
 holiday.nb-NO14.name=Julaften
-holiday.nb-NO14.date=20121224
+holiday.nb-NO14.date=20141224
 holiday.nb-NO15.name=Juledag
-holiday.nb-NO15.date=20121225
+holiday.nb-NO15.date=20141225
 holiday.nb-NO16.name=Juledag
-holiday.nb-NO16.date=20121226
+holiday.nb-NO16.date=20141226
 holiday.nb-NO17.name=Nyttårsaften
-holiday.nb-NO17.date=20121231
+holiday.nb-NO17.date=20141231
 holiday.nb-NO18.name=Nyttårsdag
-holiday.nb-NO18.date=20130101
+holiday.nb-NO18.date=20150101
 holiday.nb-NO19.name=Fastelavn
-holiday.nb-NO19.date=20130210
+holiday.nb-NO19.date=20150215
 holiday.nb-NO20.name=Palmesøndag
-holiday.nb-NO20.date=20130324
+holiday.nb-NO20.date=20150329
 holiday.nb-NO21.name=Skjærtorsdag
-holiday.nb-NO21.date=20130328
+holiday.nb-NO21.date=20150402
 holiday.nb-NO22.name=Langfredag
-holiday.nb-NO22.date=20130329
+holiday.nb-NO22.date=20150403
 holiday.nb-NO23.name=Påskedag
-holiday.nb-NO23.date=20130331
+holiday.nb-NO23.date=20150405
 holiday.nb-NO24.name=Påskedag
-holiday.nb-NO24.date=20130401
+holiday.nb-NO24.date=20150406
 holiday.nb-NO25.name=Offentlig Høytidsdag
-holiday.nb-NO25.date=20130501
+holiday.nb-NO25.date=20150501
 holiday.nb-NO26.name=Frigjøringsdag 1945
-holiday.nb-NO26.date=20130508
+holiday.nb-NO26.date=20150508
 holiday.nb-NO27.name=Grunnlovsdag
-holiday.nb-NO27.date=20130517
+holiday.nb-NO27.date=20150517
 holiday.nb-NO28.name=Kristi Himmelfartsdag
-holiday.nb-NO28.date=20130509
+holiday.nb-NO28.date=20150514
 holiday.nb-NO29.name=Pinsedag
-holiday.nb-NO29.date=20130519
+holiday.nb-NO29.date=20150524
 holiday.nb-NO30.name=Pinsedag
-holiday.nb-NO30.date=20130520
+holiday.nb-NO30.date=20150525
 holiday.nb-NO31.name=Julaften
-holiday.nb-NO31.date=20131224
+holiday.nb-NO31.date=20151224
 holiday.nb-NO32.name=Juledag
-holiday.nb-NO32.date=20131225
+holiday.nb-NO32.date=20151225
 holiday.nb-NO33.name=Juledag
-holiday.nb-NO33.date=20131226
+holiday.nb-NO33.date=20151226
 holiday.nb-NO34.name=Nyttårsaften
-holiday.nb-NO34.date=20131231
+holiday.nb-NO34.date=20151231
+holiday.nb-NO35.name=Nyttårsdag
+holiday.nb-NO35.date=20160101
+holiday.nb-NO36.name=Fastelavn
+holiday.nb-NO36.date=20160207
+holiday.nb-NO37.name=Palmesøndag
+holiday.nb-NO37.date=20160320
+holiday.nb-NO38.name=Skjærtorsdag
+holiday.nb-NO38.date=20160324
+holiday.nb-NO39.name=Langfredag
+holiday.nb-NO39.date=20160325
+holiday.nb-NO40.name=Påskedag
+holiday.nb-NO40.date=20160327
+holiday.nb-NO41.name=Påskedag
+holiday.nb-NO41.date=20160328
+holiday.nb-NO42.name=Offentlig Høytidsdag
+holiday.nb-NO42.date=20160501
+holiday.nb-NO43.name=Frigjøringsdag 1945
+holiday.nb-NO43.date=20160508
+holiday.nb-NO44.name=Grunnlovsdag
+holiday.nb-NO44.date=20160517
+holiday.nb-NO45.name=Kristi Himmelfartsdag
+holiday.nb-NO45.date=20160505
+holiday.nb-NO46.name=Pinsedag
+holiday.nb-NO46.date=20160515
+holiday.nb-NO47.name=Pinsedag
+holiday.nb-NO47.date=20160516
+holiday.nb-NO48.name=Julaften
+holiday.nb-NO48.date=20161224
+holiday.nb-NO49.name=Juledag
+holiday.nb-NO49.date=20161225
+holiday.nb-NO50.name=Juledag
+holiday.nb-NO50.date=20161226
+holiday.nb-NO51.name=Nyttårsaften
+holiday.nb-NO51.date=20161231
--- a/doc/rc/holidays.nb-SJ.rc
+++ b/doc/rc/holidays.nb-SJ.rc
@@ -0,0 +1,131 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/nb-SJ/2014.json
+# http://holidata.net/nb-SJ/2015.json
+#
+# Copyright 2006 - 2015, 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=20140101
+holiday.nb-SJ2.name=Fastelavn
+holiday.nb-SJ2.date=20140302
+holiday.nb-SJ3.name=Palmesøndag
+holiday.nb-SJ3.date=20140413
+holiday.nb-SJ4.name=Skjærtorsdag
+holiday.nb-SJ4.date=20140417
+holiday.nb-SJ5.name=Langfredag
+holiday.nb-SJ5.date=20140418
+holiday.nb-SJ6.name=Påskedag
+holiday.nb-SJ6.date=20140420
+holiday.nb-SJ7.name=Påskedag
+holiday.nb-SJ7.date=20140421
+holiday.nb-SJ8.name=Offentlig Høytidsdag
+holiday.nb-SJ8.date=20140501
+holiday.nb-SJ9.name=Frigjøringsdag 1945
+holiday.nb-SJ9.date=20140508
+holiday.nb-SJ10.name=Grunnlovsdag
+holiday.nb-SJ10.date=20140517
+holiday.nb-SJ11.name=Kristi Himmelfartsdag
+holiday.nb-SJ11.date=20140529
+holiday.nb-SJ12.name=Pinsedag
+holiday.nb-SJ12.date=20140608
+holiday.nb-SJ13.name=Pinsedag
+holiday.nb-SJ13.date=20140609
+holiday.nb-SJ14.name=Julaften
+holiday.nb-SJ14.date=20141224
+holiday.nb-SJ15.name=Juledag
+holiday.nb-SJ15.date=20141225
+holiday.nb-SJ16.name=Juledag
+holiday.nb-SJ16.date=20141226
+holiday.nb-SJ17.name=Nyttårsaften
+holiday.nb-SJ17.date=20141231
+holiday.nb-SJ18.name=Nyttårsdag
+holiday.nb-SJ18.date=20150101
+holiday.nb-SJ19.name=Fastelavn
+holiday.nb-SJ19.date=20150215
+holiday.nb-SJ20.name=Palmesøndag
+holiday.nb-SJ20.date=20150329
+holiday.nb-SJ21.name=Skjærtorsdag
+holiday.nb-SJ21.date=20150402
+holiday.nb-SJ22.name=Langfredag
+holiday.nb-SJ22.date=20150403
+holiday.nb-SJ23.name=Påskedag
+holiday.nb-SJ23.date=20150405
+holiday.nb-SJ24.name=Påskedag
+holiday.nb-SJ24.date=20150406
+holiday.nb-SJ25.name=Offentlig Høytidsdag
+holiday.nb-SJ25.date=20150501
+holiday.nb-SJ26.name=Frigjøringsdag 1945
+holiday.nb-SJ26.date=20150508
+holiday.nb-SJ27.name=Grunnlovsdag
+holiday.nb-SJ27.date=20150517
+holiday.nb-SJ28.name=Kristi Himmelfartsdag
+holiday.nb-SJ28.date=20150514
+holiday.nb-SJ29.name=Pinsedag
+holiday.nb-SJ29.date=20150524
+holiday.nb-SJ30.name=Pinsedag
+holiday.nb-SJ30.date=20150525
+holiday.nb-SJ31.name=Julaften
+holiday.nb-SJ31.date=20151224
+holiday.nb-SJ32.name=Juledag
+holiday.nb-SJ32.date=20151225
+holiday.nb-SJ33.name=Juledag
+holiday.nb-SJ33.date=20151226
+holiday.nb-SJ34.name=Nyttårsaften
+holiday.nb-SJ34.date=20151231
+holiday.nb-SJ35.name=Nyttårsdag
+holiday.nb-SJ35.date=20160101
+holiday.nb-SJ36.name=Fastelavn
+holiday.nb-SJ36.date=20160207
+holiday.nb-SJ37.name=Palmesøndag
+holiday.nb-SJ37.date=20160320
+holiday.nb-SJ38.name=Skjærtorsdag
+holiday.nb-SJ38.date=20160324
+holiday.nb-SJ39.name=Langfredag
+holiday.nb-SJ39.date=20160325
+holiday.nb-SJ40.name=Påskedag
+holiday.nb-SJ40.date=20160327
+holiday.nb-SJ41.name=Påskedag
+holiday.nb-SJ41.date=20160328
+holiday.nb-SJ42.name=Offentlig Høytidsdag
+holiday.nb-SJ42.date=20160501
+holiday.nb-SJ43.name=Frigjøringsdag 1945
+holiday.nb-SJ43.date=20160508
+holiday.nb-SJ44.name=Grunnlovsdag
+holiday.nb-SJ44.date=20160517
+holiday.nb-SJ45.name=Kristi Himmelfartsdag
+holiday.nb-SJ45.date=20160505
+holiday.nb-SJ46.name=Pinsedag
+holiday.nb-SJ46.date=20160515
+holiday.nb-SJ47.name=Pinsedag
+holiday.nb-SJ47.date=20160516
+holiday.nb-SJ48.name=Julaften
+holiday.nb-SJ48.date=20161224
+holiday.nb-SJ49.name=Juledag
+holiday.nb-SJ49.date=20161225
+holiday.nb-SJ50.name=Juledag
+holiday.nb-SJ50.date=20161226
+holiday.nb-SJ51.name=Nyttårsaften
+holiday.nb-SJ51.date=20161231
--- a/doc/rc/holidays.nl-BE.rc
+++ b/doc/rc/holidays.nl-BE.rc
@@ -0,0 +1,101 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/nl-BE/2014.json
+# http://holidata.net/nl-BE/2015.json
+#
+# Copyright 2006 - 2015, 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.nl-BE1.name=Nieuwjaar
+holiday.nl-BE1.date=20140101
+holiday.nl-BE2.name=Pasen
+holiday.nl-BE2.date=20140420
+holiday.nl-BE3.name=Paasmaandag
+holiday.nl-BE3.date=20140421
+holiday.nl-BE4.name=Dag van de arbeid
+holiday.nl-BE4.date=20140501
+holiday.nl-BE5.name=Onze Lieve Heer hemelvaart
+holiday.nl-BE5.date=20140529
+holiday.nl-BE6.name=Pinksteren
+holiday.nl-BE6.date=20140608
+holiday.nl-BE7.name=Pinkstermaandag
+holiday.nl-BE7.date=20140609
+holiday.nl-BE8.name=Nationale feestdag
+holiday.nl-BE8.date=20140721
+holiday.nl-BE9.name=Onze Lieve Vrouw hemelvaart
+holiday.nl-BE9.date=20140815
+holiday.nl-BE10.name=Allerheiligen
+holiday.nl-BE10.date=20141101
+holiday.nl-BE11.name=Wapenstilstand
+holiday.nl-BE11.date=20141111
+holiday.nl-BE12.name=Kerstmis
+holiday.nl-BE12.date=20141225
+holiday.nl-BE13.name=Nieuwjaar
+holiday.nl-BE13.date=20150101
+holiday.nl-BE14.name=Pasen
+holiday.nl-BE14.date=20150405
+holiday.nl-BE15.name=Paasmaandag
+holiday.nl-BE15.date=20150406
+holiday.nl-BE16.name=Dag van de arbeid
+holiday.nl-BE16.date=20150501
+holiday.nl-BE17.name=Onze Lieve Heer hemelvaart
+holiday.nl-BE17.date=20150514
+holiday.nl-BE18.name=Pinksteren
+holiday.nl-BE18.date=20150524
+holiday.nl-BE19.name=Pinkstermaandag
+holiday.nl-BE19.date=20150525
+holiday.nl-BE20.name=Nationale feestdag
+holiday.nl-BE20.date=20150721
+holiday.nl-BE21.name=Onze Lieve Vrouw hemelvaart
+holiday.nl-BE21.date=20150815
+holiday.nl-BE22.name=Allerheiligen
+holiday.nl-BE22.date=20151101
+holiday.nl-BE23.name=Wapenstilstand
+holiday.nl-BE23.date=20151111
+holiday.nl-BE24.name=Kerstmis
+holiday.nl-BE24.date=20151225
+holiday.nl-BE25.name=Nieuwjaar
+holiday.nl-BE25.date=20160101
+holiday.nl-BE26.name=Pasen
+holiday.nl-BE26.date=20160527
+holiday.nl-BE27.name=Paasmaandag
+holiday.nl-BE27.date=20160528
+holiday.nl-BE28.name=Dag van de arbeid
+holiday.nl-BE28.date=20160501
+holiday.nl-BE29.name=Onze Lieve Heer hemelvaart
+holiday.nl-BE29.date=20160505
+holiday.nl-BE30.name=Pinksteren
+holiday.nl-BE30.date=20160515
+holiday.nl-BE31.name=Pinkstermaandag
+holiday.nl-BE31.date=20160516
+holiday.nl-BE32.name=Nationale feestdag
+holiday.nl-BE32.date=20160721
+holiday.nl-BE33.name=Onze Lieve Vrouw hemelvaart
+holiday.nl-BE33.date=20160815
+holiday.nl-BE34.name=Allerheiligen
+holiday.nl-BE34.date=20161101
+holiday.nl-BE35.name=Wapenstilstand
+holiday.nl-BE35.date=20161111
+holiday.nl-BE36.name=Kerstmis
+holiday.nl-BE36.date=20161225
--- a/doc/rc/holidays.nl-NL.rc
+++ b/doc/rc/holidays.nl-NL.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/nl-NL/2012.json
-# http://holidata.net/nl-NL/2013.json
+# http://holidata.net/nl-NL/2014.json
+# http://holidata.net/nl-NL/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,58 +28,78 @@
 ###############################################################################

 holiday.nl-NL1.name=Nieuwjaar
-holiday.nl-NL1.date=20120101
+holiday.nl-NL1.date=20140101
 holiday.nl-NL2.name=Goede Vrijdag
-holiday.nl-NL2.date=20120406
+holiday.nl-NL2.date=20140418
 holiday.nl-NL3.name=Pasen
-holiday.nl-NL3.date=20120408
+holiday.nl-NL3.date=20140420
 holiday.nl-NL4.name=Tweede Pasdag
-holiday.nl-NL4.date=20120409
+holiday.nl-NL4.date=20140421
 holiday.nl-NL5.name=Koninginnedag
-holiday.nl-NL5.date=20120430
+holiday.nl-NL5.date=20140426
 holiday.nl-NL6.name=Dodenherdenking
-holiday.nl-NL6.date=20120504
-holiday.nl-NL7.name=Bevrijdingsdag
-holiday.nl-NL7.date=20120505
-holiday.nl-NL8.name=Hemelvaartsdag
-holiday.nl-NL8.date=20120517
-holiday.nl-NL9.name=Pinksteren
-holiday.nl-NL9.date=20120527
-holiday.nl-NL10.name=Tweede Pinksterdag
-holiday.nl-NL10.date=20120528
-holiday.nl-NL11.name=Sinterklaas
-holiday.nl-NL11.date=20121205
-holiday.nl-NL12.name=Koninkrijksdag
-holiday.nl-NL12.date=20121215
-holiday.nl-NL13.name=Kerstmis
-holiday.nl-NL13.date=20121225
-holiday.nl-NL14.name=Tweede Kerstdag
-holiday.nl-NL14.date=20121226
-holiday.nl-NL15.name=Nieuwjaar
-holiday.nl-NL15.date=20130101
-holiday.nl-NL16.name=Goede Vrijdag
-holiday.nl-NL16.date=20130329
-holiday.nl-NL17.name=Pasen
-holiday.nl-NL17.date=20130331
-holiday.nl-NL18.name=Tweede Pasdag
-holiday.nl-NL18.date=20130401
-holiday.nl-NL19.name=Koninginnedag
-holiday.nl-NL19.date=20130430
-holiday.nl-NL20.name=Dodenherdenking
-holiday.nl-NL20.date=20130504
-holiday.nl-NL21.name=Bevrijdingsdag
-holiday.nl-NL21.date=20130505
-holiday.nl-NL22.name=Hemelvaartsdag
-holiday.nl-NL22.date=20130509
-holiday.nl-NL23.name=Pinksteren
-holiday.nl-NL23.date=20130519
-holiday.nl-NL24.name=Tweede Pinksterdag
-holiday.nl-NL24.date=20130520
-holiday.nl-NL25.name=Sinterklaas
-holiday.nl-NL25.date=20131205
-holiday.nl-NL26.name=Koninkrijksdag
-holiday.nl-NL26.date=20131215
-holiday.nl-NL27.name=Kerstmis
-holiday.nl-NL27.date=20131225
-holiday.nl-NL28.name=Tweede Kerstdag
-holiday.nl-NL28.date=20131226
+holiday.nl-NL6.date=20140504
+holiday.nl-NL7.name=Hemelvaartsdag
+holiday.nl-NL7.date=20140529
+holiday.nl-NL8.name=Pinksteren
+holiday.nl-NL8.date=20140608
+holiday.nl-NL9.name=Tweede Pinksterdag
+holiday.nl-NL9.date=20140609
+holiday.nl-NL10.name=Sinterklaas
+holiday.nl-NL10.date=20141205
+holiday.nl-NL11.name=Kerstmis
+holiday.nl-NL11.date=20141225
+holiday.nl-NL12.name=Tweede Kerstdag
+holiday.nl-NL12.date=20141226
+holiday.nl-NL13.name=Nieuwjaar
+holiday.nl-NL13.date=20150101
+holiday.nl-NL14.name=Goede Vrijdag
+holiday.nl-NL14.date=20150403
+holiday.nl-NL15.name=Pasen
+holiday.nl-NL15.date=20150405
+holiday.nl-NL16.name=Tweede Pasdag
+holiday.nl-NL16.date=20150406
+holiday.nl-NL17.name=Koninginnedag
+holiday.nl-NL17.date=20150427
+holiday.nl-NL18.name=Dodenherdenking
+holiday.nl-NL18.date=20150504
+holiday.nl-NL19.name=Bevrijdingsdag
+holiday.nl-NL19.date=20150505
+holiday.nl-NL20.name=Hemelvaartsdag
+holiday.nl-NL20.date=20150514
+holiday.nl-NL21.name=Pinksteren
+holiday.nl-NL21.date=20150524
+holiday.nl-NL22.name=Tweede Pinksterdag
+holiday.nl-NL22.date=20150525
+holiday.nl-NL23.name=Sinterklaas
+holiday.nl-NL23.date=20151205
+holiday.nl-NL24.name=Kerstmis
+holiday.nl-NL24.date=20151225
+holiday.nl-NL25.name=Tweede Kerstdag
+holiday.nl-NL25.date=20151226
+holiday.nl-NL26.name=Nieuwjaar
+holiday.nl-NL26.date=20160101
+holiday.nl-NL27.name=Goede Vrijdag
+holiday.nl-NL27.date=20160325
+holiday.nl-NL28.name=Pasen
+holiday.nl-NL28.date=20160327
+holiday.nl-NL29.name=Tweede Pasdag
+holiday.nl-NL29.date=20160328
+holiday.nl-NL30.name=Koninginnedag
+holiday.nl-NL30.date=20160427
+holiday.nl-NL31.name=Dodenherdenking
+holiday.nl-NL31.date=20160504
+holiday.nl-NL32.name=Bevrijdingsdag
+holiday.nl-NL32.date=20160505
+holiday.nl-NL33.name=Hemelvaartsdag
+holiday.nl-NL33.date=20160505
+holiday.nl-NL34.name=Pinksteren
+holiday.nl-NL34.date=20160515
+holiday.nl-NL35.name=Tweede Pinksterdag
+holiday.nl-NL35.date=20160516
+holiday.nl-NL36.name=Sinterklaas
+holiday.nl-NL36.date=20161205
+holiday.nl-NL37.name=Kerstmis
+holiday.nl-NL37.date=20161225
+holiday.nl-NL38.name=Tweede Kerstdag
+holiday.nl-NL38.date=20161226
--- a/doc/rc/holidays.pl-PL.rc
+++ b/doc/rc/holidays.pl-PL.rc
@@ -0,0 +1,113 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/pl-PL/2014.json
+# http://holidata.net/pl-PL/2015.json
+#
+# Copyright 2006 - 2015, 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.pl-PL1.name=Nowy Rok
+holiday.pl-PL1.date=20140101
+holiday.pl-PL2.name=Trzech Króli
+holiday.pl-PL2.date=20140106
+holiday.pl-PL3.name=Wielkanoc
+holiday.pl-PL3.date=20140420
+holiday.pl-PL4.name=Poniedziałek Wielkanocny
+holiday.pl-PL4.date=20140421
+holiday.pl-PL5.name=Święto Pracy
+holiday.pl-PL5.date=20140501
+holiday.pl-PL6.name=Święto Konstytucji Trzeciego Maja
+holiday.pl-PL6.date=20140503
+holiday.pl-PL7.name=Zielone Świątki
+holiday.pl-PL7.date=20140608
+holiday.pl-PL8.name=Boże Ciało
+holiday.pl-PL8.date=20140619
+holiday.pl-PL9.name=Święto Wojska Polskiego
+holiday.pl-PL9.date=20140815
+holiday.pl-PL10.name=Wniebowzięcia NMP
+holiday.pl-PL10.date=20140815
+holiday.pl-PL11.name=Wszystkich Świętych
+holiday.pl-PL11.date=20141101
+holiday.pl-PL12.name=Dzień Niepodległości
+holiday.pl-PL12.date=20141111
+holiday.pl-PL13.name=Boże Narodzenie (pierwszy dzień)
+holiday.pl-PL13.date=20141225
+holiday.pl-PL14.name=Boże Narodzenie (drugi dzień)
+holiday.pl-PL14.date=20141226
+holiday.pl-PL15.name=Nowy Rok
+holiday.pl-PL15.date=20150101
+holiday.pl-PL16.name=Trzech Króli
+holiday.pl-PL16.date=20150106
+holiday.pl-PL17.name=Wielkanoc
+holiday.pl-PL17.date=20150405
+holiday.pl-PL18.name=Poniedziałek Wielkanocny
+holiday.pl-PL18.date=20150406
+holiday.pl-PL19.name=Święto Pracy
+holiday.pl-PL19.date=20150501
+holiday.pl-PL20.name=Święto Konstytucji Trzeciego Maja
+holiday.pl-PL20.date=20150503
+holiday.pl-PL21.name=Zielone Świątki
+holiday.pl-PL21.date=20150524
+holiday.pl-PL22.name=Boże Ciało
+holiday.pl-PL22.date=20150604
+holiday.pl-PL23.name=Święto Wojska Polskiego
+holiday.pl-PL23.date=20150815
+holiday.pl-PL24.name=Wniebowzięcia NMP
+holiday.pl-PL24.date=20150815
+holiday.pl-PL25.name=Wszystkich Świętych
+holiday.pl-PL25.date=20151101
+holiday.pl-PL26.name=Dzień Niepodległości
+holiday.pl-PL26.date=20151111
+holiday.pl-PL27.name=Boże Narodzenie (pierwszy dzień)
+holiday.pl-PL27.date=20151225
+holiday.pl-PL28.name=Boże Narodzenie (drugi dzień)
+holiday.pl-PL28.date=20151226
+holiday.pl-PL29.name=Nowy Rok
+holiday.pl-PL29.date=20160101
+holiday.pl-PL30.name=Trzech Króli
+holiday.pl-PL30.date=20160106
+holiday.pl-PL31.name=Wielkanoc
+holiday.pl-PL31.date=20160327
+holiday.pl-PL32.name=Poniedziałek Wielkanocny
+holiday.pl-PL32.date=20160328
+holiday.pl-PL33.name=Święto Pracy
+holiday.pl-PL33.date=20160501
+holiday.pl-PL34.name=Święto Konstytucji Trzeciego Maja
+holiday.pl-PL34.date=20160503
+holiday.pl-PL35.name=Zielone Świątki
+holiday.pl-PL35.date=20160515
+holiday.pl-PL36.name=Boże Ciało
+holiday.pl-PL36.date=20160526
+holiday.pl-PL37.name=Święto Wojska Polskiego
+holiday.pl-PL37.date=20160815
+holiday.pl-PL38.name=Wniebowzięcia NMP
+holiday.pl-PL38.date=20160815
+holiday.pl-PL39.name=Wszystkich Świętych
+holiday.pl-PL39.date=20161101
+holiday.pl-PL40.name=Dzień Niepodległości
+holiday.pl-PL40.date=20161111
+holiday.pl-PL41.name=Boże Narodzenie (pierwszy dzień)
+holiday.pl-PL41.date=20161225
+holiday.pl-PL42.name=Boże Narodzenie (drugi dzień)
+holiday.pl-PL42.date=20161226
--- a/doc/rc/holidays.por-PRT.rc
+++ b/doc/rc/holidays.por-PRT.rc
@@ -0,0 +1 @@
+holidays.pt-PT.rc
--- a/doc/rc/holidays.pt-BR.rc
+++ b/doc/rc/holidays.pt-BR.rc
@@ -0,0 +1,107 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/pt-BR/2014.json
+# http://holidata.net/pt-BR/2015.json
+#
+# Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# http://www.opensource.org/licenses/mit-license.php
+#
+###############################################################################
+
+holiday.pt-BR1.name=Confraternização Universal
+holiday.pt-BR1.date=20140101
+holiday.pt-BR2.name=Carnaval
+holiday.pt-BR2.date=20140303
+holiday.pt-BR3.name=Carnaval
+holiday.pt-BR3.date=20140304
+holiday.pt-BR4.name=Sexta-feira Santa
+holiday.pt-BR4.date=20140418
+holiday.pt-BR5.name=Páscoa
+holiday.pt-BR5.date=20140420
+holiday.pt-BR6.name=Tiradentes
+holiday.pt-BR6.date=20140421
+holiday.pt-BR7.name=Dia do Trabalho
+holiday.pt-BR7.date=20140501
+holiday.pt-BR8.name=Corpus Christi
+holiday.pt-BR8.date=20140619
+holiday.pt-BR9.name=Independência do Brasil
+holiday.pt-BR9.date=20140907
+holiday.pt-BR10.name=Nossa Senhora Aparecida
+holiday.pt-BR10.date=20141012
+holiday.pt-BR11.name=Finados
+holiday.pt-BR11.date=20141102
+holiday.pt-BR12.name=Proclamação da República
+holiday.pt-BR12.date=20141115
+holiday.pt-BR13.name=Natal
+holiday.pt-BR13.date=20141225
+holiday.pt-BR14.name=Confraternização Universal
+holiday.pt-BR14.date=20150101
+holiday.pt-BR15.name=Carnaval
+holiday.pt-BR15.date=20150216
+holiday.pt-BR16.name=Carnaval
+holiday.pt-BR16.date=20150217
+holiday.pt-BR17.name=Sexta-feira Santa
+holiday.pt-BR17.date=20150403
+holiday.pt-BR18.name=Páscoa
+holiday.pt-BR18.date=20150405
+holiday.pt-BR19.name=Tiradentes
+holiday.pt-BR19.date=20150421
+holiday.pt-BR20.name=Dia do Trabalho
+holiday.pt-BR20.date=20150501
+holiday.pt-BR21.name=Corpus Christi
+holiday.pt-BR21.date=20150604
+holiday.pt-BR22.name=Independência do Brasil
+holiday.pt-BR22.date=20150907
+holiday.pt-BR23.name=Nossa Senhora Aparecida
+holiday.pt-BR23.date=20151012
+holiday.pt-BR24.name=Finados
+holiday.pt-BR24.date=20151102
+holiday.pt-BR25.name=Proclamação da República
+holiday.pt-BR25.date=20151115
+holiday.pt-BR26.name=Natal
+holiday.pt-BR26.date=20151225
+holiday.pt-BR27.name=Confraternização Universal
+holiday.pt-BR27.date=20160101
+holiday.pt-BR28.name=Carnaval
+holiday.pt-BR28.date=20160208
+holiday.pt-BR29.name=Carnaval
+holiday.pt-BR29.date=20160209
+holiday.pt-BR30.name=Sexta-feira Santa
+holiday.pt-BR30.date=20160325
+holiday.pt-BR31.name=Páscoa
+holiday.pt-BR31.date=20160327
+holiday.pt-BR32.name=Tiradentes
+holiday.pt-BR32.date=20160421
+holiday.pt-BR33.name=Dia do Trabalho
+holiday.pt-BR33.date=20160501
+holiday.pt-BR34.name=Corpus Christi
+holiday.pt-BR34.date=20160526
+holiday.pt-BR35.name=Independência do Brasil
+holiday.pt-BR35.date=20160907
+holiday.pt-BR36.name=Nossa Senhora Aparecida
+holiday.pt-BR36.date=20161012
+holiday.pt-BR37.name=Finados
+holiday.pt-BR37.date=20161102
+holiday.pt-BR38.name=Proclamação da República
+holiday.pt-BR38.date=20161115
+holiday.pt-BR39.name=Natal
+holiday.pt-BR39.date=20161225
--- a/doc/rc/holidays.pt-PT.rc
+++ b/doc/rc/holidays.pt-PT.rc
@@ -0,0 +1,113 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/pt-PT/2014.json
+# http://holidata.net/pt-PT/2015.json
+#
+# Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# http://www.opensource.org/licenses/mit-license.php
+#
+###############################################################################
+
+holiday.pt-PT1.name=Ano Novo
+holiday.pt-PT1.date=20140101
+holiday.pt-PT2.name=Carnaval
+holiday.pt-PT2.date=20140304
+holiday.pt-PT3.name=Sexta-feira Santa
+holiday.pt-PT3.date=20140418
+holiday.pt-PT4.name=Páscoa
+holiday.pt-PT4.date=20140420
+holiday.pt-PT5.name=Dia da Liberdade
+holiday.pt-PT5.date=20140425
+holiday.pt-PT6.name=Dia do Trabalhador
+holiday.pt-PT6.date=20140501
+holiday.pt-PT7.name=Corpo de Deus
+holiday.pt-PT7.date=20140619
+holiday.pt-PT8.name=Dia de Portugal
+holiday.pt-PT8.date=20140610
+holiday.pt-PT9.name=Assunção de Nossa Senhora
+holiday.pt-PT9.date=20140815
+holiday.pt-PT10.name=Implantação da República
+holiday.pt-PT10.date=20141005
+holiday.pt-PT11.name=Todos os Santos
+holiday.pt-PT11.date=20141101
+holiday.pt-PT12.name=Restauração da Independência
+holiday.pt-PT12.date=20141201
+holiday.pt-PT13.name=Imaculada Conceição
+holiday.pt-PT13.date=20141208
+holiday.pt-PT14.name=Natal
+holiday.pt-PT14.date=20141225
+holiday.pt-PT15.name=Ano Novo
+holiday.pt-PT15.date=20150101
+holiday.pt-PT16.name=Carnaval
+holiday.pt-PT16.date=20150217
+holiday.pt-PT17.name=Sexta-feira Santa
+holiday.pt-PT17.date=20150403
+holiday.pt-PT18.name=Páscoa
+holiday.pt-PT18.date=20150405
+holiday.pt-PT19.name=Dia da Liberdade
+holiday.pt-PT19.date=20150425
+holiday.pt-PT20.name=Dia do Trabalhador
+holiday.pt-PT20.date=20150501
+holiday.pt-PT21.name=Corpo de Deus
+holiday.pt-PT21.date=20150604
+holiday.pt-PT22.name=Dia de Portugal
+holiday.pt-PT22.date=20150610
+holiday.pt-PT23.name=Assunção de Nossa Senhora
+holiday.pt-PT23.date=20150815
+holiday.pt-PT24.name=Implantação da República
+holiday.pt-PT24.date=20151005
+holiday.pt-PT25.name=Todos os Santos
+holiday.pt-PT25.date=20151101
+holiday.pt-PT26.name=Restauração da Independência
+holiday.pt-PT26.date=20151201
+holiday.pt-PT27.name=Imaculada Conceição
+holiday.pt-PT27.date=20151208
+holiday.pt-PT28.name=Natal
+holiday.pt-PT28.date=20151225
+holiday.pt-PT29.name=Ano Novo
+holiday.pt-PT29.date=20160101
+holiday.pt-PT30.name=Carnaval
+holiday.pt-PT30.date=20160209
+holiday.pt-PT31.name=Sexta-feira Santa
+holiday.pt-PT31.date=20160325
+holiday.pt-PT32.name=Páscoa
+holiday.pt-PT32.date=20160327
+holiday.pt-PT33.name=Dia da Liberdade
+holiday.pt-PT33.date=20160425
+holiday.pt-PT34.name=Dia do Trabalhador
+holiday.pt-PT34.date=20160501
+holiday.pt-PT35.name=Corpo de Deus
+holiday.pt-PT35.date=20160526
+holiday.pt-PT36.name=Dia de Portugal
+holiday.pt-PT36.date=20160610
+holiday.pt-PT37.name=Assunção de Nossa Senhora
+holiday.pt-PT37.date=20160815
+holiday.pt-PT38.name=Implantação da República
+holiday.pt-PT38.date=20161005
+holiday.pt-PT39.name=Todos os Santos
+holiday.pt-PT39.date=20161101
+holiday.pt-PT40.name=Restauração da Independência
+holiday.pt-PT40.date=20161201
+holiday.pt-PT41.name=Imaculada Conceição
+holiday.pt-PT41.date=20161208
+holiday.pt-PT42.name=Natal
+holiday.pt-PT42.date=20161225
--- a/doc/rc/holidays.ru-RU.rc
+++ b/doc/rc/holidays.ru-RU.rc
@@ -0,0 +1,83 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/ru-RU/2014.json
+# http://holidata.net/ru-RU/2015.json
+#
+# Copyright 2006 - 2015, 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.ru-RU1.name=Новый Год
+holiday.ru-RU1.date=20140101
+holiday.ru-RU2.name=Рождество Христово
+holiday.ru-RU2.date=20140107
+holiday.ru-RU3.name=День защитника Отечества
+holiday.ru-RU3.date=20140223
+holiday.ru-RU4.name=Международный женский день
+holiday.ru-RU4.date=20140803
+holiday.ru-RU5.name=Пасха
+holiday.ru-RU5.date=20140420
+holiday.ru-RU6.name=Праздник весны и труда
+holiday.ru-RU6.date=20140501
+holiday.ru-RU7.name=День Победы
+holiday.ru-RU7.date=20140509
+holiday.ru-RU8.name=День России
+holiday.ru-RU8.date=20140612
+holiday.ru-RU9.name=День народного единства
+holiday.ru-RU9.date=20141104
+holiday.ru-RU10.name=Новый Год
+holiday.ru-RU10.date=20150101
+holiday.ru-RU11.name=Рождество Христово
+holiday.ru-RU11.date=20150107
+holiday.ru-RU12.name=День защитника Отечества
+holiday.ru-RU12.date=20150223
+holiday.ru-RU13.name=Международный женский день
+holiday.ru-RU13.date=20150803
+holiday.ru-RU14.name=Пасха
+holiday.ru-RU14.date=20150412
+holiday.ru-RU15.name=Праздник весны и труда
+holiday.ru-RU15.date=20150501
+holiday.ru-RU16.name=День Победы
+holiday.ru-RU16.date=20150509
+holiday.ru-RU17.name=День России
+holiday.ru-RU17.date=20150612
+holiday.ru-RU18.name=День народного единства
+holiday.ru-RU18.date=20151104
+holiday.ru-RU19.name=Новый Год
+holiday.ru-RU19.date=20160101
+holiday.ru-RU20.name=Рождество Христово
+holiday.ru-RU20.date=20160107
+holiday.ru-RU21.name=День защитника Отечества
+holiday.ru-RU21.date=20160223
+holiday.ru-RU22.name=Международный женский день
+holiday.ru-RU22.date=20160803
+holiday.ru-RU23.name=Пасха
+holiday.ru-RU23.date=20160501
+holiday.ru-RU24.name=Праздник весны и труда
+holiday.ru-RU24.date=20160501
+holiday.ru-RU25.name=День Победы
+holiday.ru-RU25.date=20160509
+holiday.ru-RU26.name=День России
+holiday.ru-RU26.date=20160612
+holiday.ru-RU27.name=День народного единства
+holiday.ru-RU27.date=20161104
--- a/doc/rc/holidays.sv-SE.rc
+++ b/doc/rc/holidays.sv-SE.rc
@@ -1,9 +1,9 @@
 ###############################################################################
 # International Holiday Data provided by Holidata.net
-# http://holidata.net/sv-SE/2012.json
-# http://holidata.net/sv-SE/2013.json
+# http://holidata.net/sv-SE/2014.json
+# http://holidata.net/sv-SE/2015.json
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -28,70 +28,104 @@
 ###############################################################################

 holiday.sv-SE1.name=Nyårsdagen
-holiday.sv-SE1.date=20120101
+holiday.sv-SE1.date=20140101
 holiday.sv-SE2.name=Trettondedag jul
-holiday.sv-SE2.date=20120106
+holiday.sv-SE2.date=20140106
 holiday.sv-SE3.name=Långfredagen
-holiday.sv-SE3.date=20120406
+holiday.sv-SE3.date=20140418
 holiday.sv-SE4.name=Påskdagen
-holiday.sv-SE4.date=20120408
+holiday.sv-SE4.date=20140420
 holiday.sv-SE5.name=Annandag påsk
-holiday.sv-SE5.date=20120409
+holiday.sv-SE5.date=20140421
 holiday.sv-SE6.name=Valborgmässoafton
-holiday.sv-SE6.date=20120430
+holiday.sv-SE6.date=20140430
 holiday.sv-SE7.name=Första maj
-holiday.sv-SE7.date=20120501
+holiday.sv-SE7.date=20140501
 holiday.sv-SE8.name=Kristi Himmelsfärdsdag
-holiday.sv-SE8.date=20120517
+holiday.sv-SE8.date=20140529
 holiday.sv-SE9.name=Pingstdagen
-holiday.sv-SE9.date=20120527
+holiday.sv-SE9.date=20140608
 holiday.sv-SE10.name=Nationaldagen
-holiday.sv-SE10.date=20120606
+holiday.sv-SE10.date=20140606
 holiday.sv-SE11.name=Midsommarafton
-holiday.sv-SE11.date=20120622
+holiday.sv-SE11.date=20140620
 holiday.sv-SE12.name=Midsommardagen
-holiday.sv-SE12.date=20120623
+holiday.sv-SE12.date=20140621
 holiday.sv-SE13.name=Alla Helgons Dag
-holiday.sv-SE13.date=20121103
+holiday.sv-SE13.date=20141101
 holiday.sv-SE14.name=Julafton
-holiday.sv-SE14.date=20121224
+holiday.sv-SE14.date=20141224
 holiday.sv-SE15.name=Juldagen
-holiday.sv-SE15.date=20121225
+holiday.sv-SE15.date=20141225
 holiday.sv-SE16.name=Annandag jul
-holiday.sv-SE16.date=20121226
+holiday.sv-SE16.date=20141226
 holiday.sv-SE17.name=Nyårsafton
-holiday.sv-SE17.date=20121231
+holiday.sv-SE17.date=20141231
 holiday.sv-SE18.name=Nyårsdagen
-holiday.sv-SE18.date=20130101
+holiday.sv-SE18.date=20150101
 holiday.sv-SE19.name=Trettondedag jul
-holiday.sv-SE19.date=20130106
+holiday.sv-SE19.date=20150106
 holiday.sv-SE20.name=Långfredagen
-holiday.sv-SE20.date=20130329
+holiday.sv-SE20.date=20150403
 holiday.sv-SE21.name=Påskdagen
-holiday.sv-SE21.date=20130331
+holiday.sv-SE21.date=20150405
 holiday.sv-SE22.name=Annandag påsk
-holiday.sv-SE22.date=20130401
+holiday.sv-SE22.date=20150406
 holiday.sv-SE23.name=Valborgmässoafton
-holiday.sv-SE23.date=20130430
+holiday.sv-SE23.date=20150430
 holiday.sv-SE24.name=Första maj
-holiday.sv-SE24.date=20130501
+holiday.sv-SE24.date=20150501
 holiday.sv-SE25.name=Kristi Himmelsfärdsdag
-holiday.sv-SE25.date=20130509
+holiday.sv-SE25.date=20150514
 holiday.sv-SE26.name=Pingstdagen
-holiday.sv-SE26.date=20130519
+holiday.sv-SE26.date=20150524
 holiday.sv-SE27.name=Nationaldagen
-holiday.sv-SE27.date=20130606
+holiday.sv-SE27.date=20150606
 holiday.sv-SE28.name=Midsommarafton
-holiday.sv-SE28.date=20130621
+holiday.sv-SE28.date=20150619
 holiday.sv-SE29.name=Midsommardagen
-holiday.sv-SE29.date=20130622
+holiday.sv-SE29.date=20150620
 holiday.sv-SE30.name=Alla Helgons Dag
-holiday.sv-SE30.date=20131102
+holiday.sv-SE30.date=20151031
 holiday.sv-SE31.name=Julafton
-holiday.sv-SE31.date=20131224
+holiday.sv-SE31.date=20151224
 holiday.sv-SE32.name=Juldagen
-holiday.sv-SE32.date=20131225
+holiday.sv-SE32.date=20151225
 holiday.sv-SE33.name=Annandag jul
-holiday.sv-SE33.date=20131226
+holiday.sv-SE33.date=20151226
 holiday.sv-SE34.name=Nyårsafton
-holiday.sv-SE34.date=20131231
+holiday.sv-SE34.date=20151231
+holiday.sv-SE35.name=Nyårsdagen
+holiday.sv-SE35.date=20160101
+holiday.sv-SE36.name=Trettondedag jul
+holiday.sv-SE36.date=20160106
+holiday.sv-SE37.name=Långfredagen
+holiday.sv-SE37.date=20160325
+holiday.sv-SE38.name=Påskdagen
+holiday.sv-SE38.date=20160327
+holiday.sv-SE39.name=Annandag påsk
+holiday.sv-SE39.date=20160328
+holiday.sv-SE40.name=Valborgmässoafton
+holiday.sv-SE40.date=20160430
+holiday.sv-SE41.name=Första maj
+holiday.sv-SE41.date=20160501
+holiday.sv-SE42.name=Kristi Himmelsfärdsdag
+holiday.sv-SE42.date=20160505
+holiday.sv-SE43.name=Pingstdagen
+holiday.sv-SE43.date=20160515
+holiday.sv-SE44.name=Nationaldagen
+holiday.sv-SE44.date=20160606
+holiday.sv-SE45.name=Midsommarafton
+holiday.sv-SE45.date=20160624
+holiday.sv-SE46.name=Midsommardagen
+holiday.sv-SE46.date=20160625
+holiday.sv-SE47.name=Alla Helgons Dag
+holiday.sv-SE47.date=20161105
+holiday.sv-SE48.name=Julafton
+holiday.sv-SE48.date=20161224
+holiday.sv-SE49.name=Juldagen
+holiday.sv-SE49.date=20161225
+holiday.sv-SE50.name=Annandag jul
+holiday.sv-SE50.date=20161226
+holiday.sv-SE51.name=Nyårsafton
+holiday.sv-SE51.date=20161231
--- a/doc/rc/holidays.tr-TR.rc
+++ b/doc/rc/holidays.tr-TR.rc
@@ -0,0 +1,107 @@
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/tr-TR/2014.json
+# http://holidata.net/tr-TR/2015.json
+#
+# Copyright 2006 - 2015, 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.tr-TR1.name=Yılbaşı
+holiday.tr-TR1.date=20140101
+holiday.tr-TR2.name=Ulusal Egemenlik ve Çocuk Bayramı
+holiday.tr-TR2.date=20140423
+holiday.tr-TR3.name=Emek ve Dayanışma Günü
+holiday.tr-TR3.date=20140501
+holiday.tr-TR4.name=Atatürk'ü Anma Gençlik ve Spor Bayramı
+holiday.tr-TR4.date=20140519
+holiday.tr-TR5.name=Zafer Bayramı
+holiday.tr-TR5.date=20140830
+holiday.tr-TR6.name=Cumhuriyet Bayramı
+holiday.tr-TR6.date=20141029
+holiday.tr-TR7.name=Ramazan Bayramı 1
+holiday.tr-TR7.date=20140728
+holiday.tr-TR8.name=Ramazan Bayramı 2
+holiday.tr-TR8.date=20140729
+holiday.tr-TR9.name=Ramazan Bayramı 3
+holiday.tr-TR9.date=20140730
+holiday.tr-TR10.name=Kurban Bayramı 1
+holiday.tr-TR10.date=20141004
+holiday.tr-TR11.name=Kurban Bayramı 2
+holiday.tr-TR11.date=20141005
+holiday.tr-TR12.name=Kurban Bayramı 3
+holiday.tr-TR12.date=20141006
+holiday.tr-TR13.name=Kurban Bayramı 4
+holiday.tr-TR13.date=20141007
+holiday.tr-TR14.name=Yılbaşı
+holiday.tr-TR14.date=20150101
+holiday.tr-TR15.name=Ulusal Egemenlik ve Çocuk Bayramı
+holiday.tr-TR15.date=20150423
+holiday.tr-TR16.name=Emek ve Dayanışma Günü
+holiday.tr-TR16.date=20150501
+holiday.tr-TR17.name=Atatürk'ü Anma Gençlik ve Spor Bayramı
+holiday.tr-TR17.date=20150519
+holiday.tr-TR18.name=Zafer Bayramı
+holiday.tr-TR18.date=20150830
+holiday.tr-TR19.name=Cumhuriyet Bayramı
+holiday.tr-TR19.date=20151029
+holiday.tr-TR20.name=Ramazan Bayramı 1
+holiday.tr-TR20.date=20150717
+holiday.tr-TR21.name=Ramazan Bayramı 2
+holiday.tr-TR21.date=20150718
+holiday.tr-TR22.name=Ramazan Bayramı 3
+holiday.tr-TR22.date=20150719
+holiday.tr-TR23.name=Kurban Bayramı 1
+holiday.tr-TR23.date=20150923
+holiday.tr-TR24.name=Kurban Bayramı 2
+holiday.tr-TR24.date=20150924
+holiday.tr-TR25.name=Kurban Bayramı 3
+holiday.tr-TR25.date=20150925
+holiday.tr-TR26.name=Kurban Bayramı 4
+holiday.tr-TR26.date=20150926
+holiday.tr-TR27.name=Yılbaşı
+holiday.tr-TR27.date=20160101
+holiday.tr-TR28.name=Ulusal Egemenlik ve Çocuk Bayramı
+holiday.tr-TR28.date=20160423
+holiday.tr-TR29.name=Emek ve Dayanışma Günü
+holiday.tr-TR29.date=20160501
+holiday.tr-TR30.name=Atatürk'ü Anma Gençlik ve Spor Bayramı
+holiday.tr-TR30.date=20160519
+holiday.tr-TR31.name=Zafer Bayramı
+holiday.tr-TR31.date=20160830
+holiday.tr-TR32.name=Cumhuriyet Bayramı
+holiday.tr-TR32.date=20161029
+holiday.tr-TR33.name=Ramazan Bayramı 1
+holiday.tr-TR33.date=20160705
+holiday.tr-TR34.name=Ramazan Bayramı 2
+holiday.tr-TR34.date=20160706
+holiday.tr-TR35.name=Ramazan Bayramı 3
+holiday.tr-TR35.date=20160707
+holiday.tr-TR36.name=Kurban Bayramı 1
+holiday.tr-TR36.date=20160912
+holiday.tr-TR37.name=Kurban Bayramı 2
+holiday.tr-TR37.date=20160913
+holiday.tr-TR38.name=Kurban Bayramı 3
+holiday.tr-TR38.date=20160914
+holiday.tr-TR39.name=Kurban Bayramı 4
+holiday.tr-TR39.date=20160915
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -1,9 +1,6 @@
 ###############################################################################
-# Sample taskwarrior 1.9 (or later) light 16-color theme
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,76 @@
 #
 ###############################################################################

-color=on
-color.header=blue
-color.footnote=blue
-color.debug=blue
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.

-color.summary.bar=black on green
-color.summary.background=white on black
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=
+color.header=bold white on bright black
+color.footnote=bold cyan on bright black
+color.warning=bold red
+color.error=red on white
+color.debug=white on black

-color.history.add=black on red
-color.history.done=black on green
-color.history.delete=black on yellow
+# Task state
+color.completed=green on black
+color.deleted=red on black
+color.active=bold yellow on bright black
+color.recurring=
+color.scheduled=on bright cyan
+color.until=
+color.blocking=red
+color.blocked=blue

-color.burndown.pending=on red
-color.burndown.started=on yellow
+# Project
+color.project.none=
+
+# Priority
+color.pri.H=
+color.pri.M=
+color.pri.L=bright black
+color.pri.none=
+
+# Tags
+color.tag.next=bold yellow on bright black
+color.tag.none=
+color.tagged=
+
+# Due
+color.due=on bright green
+color.due.today=on bright yellow
+color.overdue=on bright magenta
+
+# Report: burndown
+color.burndown.pending=on bright green
+color.burndown.started=on bright yellow
 color.burndown.done=on green

+# Report: history
+color.history.add=blue on bright yellow
+color.history.done=green on bright green
+color.history.delete=black on red
+
+# Report: summary
+color.summary.bar=on bright green
+color.summary.background=on white
+
+# Command: calendar
+color.calendar.due=on bright green
+color.calendar.due.today=blue on bright yellow
+color.calendar.holiday=yellow
+color.calendar.overdue=on bright magenta
+color.calendar.today=blue
+color.calendar.weekend=on white
+color.calendar.weeknumber=white on bright black
+
+# Command: sync
 color.sync.added=green
 color.sync.changed=yellow
 color.sync.rejected=red

-color.undo.before=red
+# Command: undo
+color.undo.before=yellow
 color.undo.after=green

-color.calendar.today=black on bright blue
-color.calendar.due=white on red
-color.calendar.due.today=bold white on red
-color.calendar.overdue=black on bright red
-color.calendar.weekend=white on bright black
-color.calendar.holiday=black on yellow
-color.calendar.weeknumber=bold blue
-
-color.recurring=blue
-color.overdue=bold red
-color.due.today=red
-color.due=red
-color.active=black on green
-color.pri.none=
-color.pri.H=bold black
-color.pri.M=black
-color.pri.L=
-color.tagged=green
-color.blocked=white on black
-color.project.none=
-color.tag.none=
-color.alternate=
-
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -1,9 +1,6 @@
 ###############################################################################
-# Sample taskwarrior 1.9 (or later) light 256-color theme
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2015, 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
@@ -27,49 +24,76 @@
 #
 ###############################################################################

-color=on
-color.header=color4
-color.footnote=color4
-color.debug=color4
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.

-color.summary.bar=black on rgb141
-color.summary.background=white on color0
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on gray22
+color.header=color15 on gray8
+color.footnote=on gray18
+color.warning=color9
+color.error=red on white
+color.debug=color7 on color0

-color.history.add=color0 on rgb500
-color.history.done=color0 on rgb050
-color.history.delete=color0 on rgb550
+# Task state
+color.completed=rgb353 on rgb000
+color.deleted=rgb533 on rgb000
+color.active=rgb420
+color.recurring=
+color.scheduled=on rgb345
+color.until=
+color.blocking=rgb300
+color.blocked=rgb003

-color.burndown.pending=on rgb200
-color.burndown.started=on rgb520
-color.burndown.done=on rgb011
-
-color.sync.added=rgb011
-color.sync.changed=rgb520
-color.sync.rejected=rgb200
-
-color.undo.before=color1
-color.undo.after=color2
-
-color.calendar.today=color15 on rgb013
-color.calendar.due=color0 on color9
-color.calendar.due.today=color15 on color1
-color.calendar.overdue=color0 on color1
-color.calendar.weekend=on color253
-color.calendar.holiday=color0 on color3
-color.calendar.weeknumber=rgb013
-
-color.recurring=rgb013
-color.overdue=color1
-color.due.today=rgb400
-color.due=color9
-color.active=rgb555 on rgb520
-color.pri.none=
-color.pri.H=color232
-color.pri.M=color237
-color.pri.L=color242
-color.tagged=rgb020
-color.blocked=gray12 on gray4
+# Project
 color.project.none=
-color.tag.none=
-color.alternate=on color254
+
+# Priority
+color.pri.H=gray0
+color.pri.M=gray5
+color.pri.L=gray10
+color.pri.none=gray5
+
+# Tags
+color.tag.next=rgb420
+color.tag.none=
+color.tagged=
+
+# Due
+color.due=on rgb343
+color.due.today=on rgb353
+color.overdue=on rgb544
+
+# Report: burndown
+color.burndown.pending=on rgb141 
+color.burndown.started=on rgb440
+color.burndown.done=on rgb151
+
+# Report: history
+color.history.add=rgb005 on rgb440
+color.history.done=rgb020 on rgb343
+color.history.delete=rgb300 on rgb533
+
+# Report: summary
+color.summary.bar=on rgb141
+color.summary.background=on gray20
+
+# Command: calendar
+color.calendar.due=on rgb343
+color.calendar.due.today=on rgb353
+color.calendar.holiday=rgb420
+color.calendar.overdue=on rgb533
+color.calendar.today=rgb005
+color.calendar.weekend=on gray21
+color.calendar.weeknumber=gray16
+
+# Command: sync
+color.sync.added=green
+color.sync.changed=yellow
+color.sync.rejected=red
+
+# Command: undo
+color.undo.before=yellow
+color.undo.after=green

--- a/doc/rc/no-color.theme
+++ b/doc/rc/no-color.theme
@@ -0,0 +1,102 @@
+###############################################################################
+#
+# Copyright 2006 - 2015, 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
+#
+###############################################################################
+
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# This is a theme that disables all default colors
+# It can be used as template for other themes
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=
+color.header=
+color.footnote=
+color.warning=
+color.error=
+color.debug=
+
+# Task state
+color.completed=
+color.deleted=
+color.active=
+color.recurring=
+color.scheduled=
+color.until=
+color.blocked=
+color.blocking=
+
+# Project
+color.project.none=
+
+# Priority
+color.pri.H=
+color.pri.L=
+color.pri.M=
+color.pri.none=
+
+# Tags
+color.tag.next=
+color.tag.none=
+color.tagged=
+
+# Due
+color.due=
+color.due.today=
+color.overdue=
+
+# Report: burndown
+color.burndown.done=
+color.burndown.pending=
+color.burndown.started=
+
+# Report: history
+color.history.add=
+color.history.delete=
+color.history.done=
+
+# Report: summary
+color.summary.background=
+color.summary.bar=
+
+# Command: calendar
+color.calendar.due=
+color.calendar.due.today=
+color.calendar.holiday=
+color.calendar.overdue=
+color.calendar.today=
+color.calendar.weekend=
+color.calendar.weeknumber=
+
+# Command: sync
+color.sync.added=
+color.sync.changed=
+color.sync.rejected=
+
+# Command: undo
+color.undo.after=
+color.undo.before=
+
--- a/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@@ -1,23 +1,6 @@
 ################################################################################
-# Taskwarrior solarized-dark-256 theme created by Stefan A. Keel.
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
-# 
-# Colors used are based on the Solarized palette created by Ethan Schoonover 
-# <http://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 includes themes for iTerm2, OSX Terminal.app, and Xresources.
-# Others are also available, i.e.:
-# Gnome Terminal <https://github.com/sigurdga/gnome-terminal-colors-solarized>
-#
-# Colors 0 through 15 in this theme are based on the 16 color positions defined
-# in the Xresources file distributed with the Solarized color palette.  Some 
-# of the colors used are "named" in order to use the bold feature.  The color
-# "name" is based on the color's original name as the terminal understands it.
+# Copyright 2006 - 2015, 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
@@ -39,19 +22,81 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
+###############################################################################

-color=on
+# Colors used are based on the Solarized palette created by Ethan Schoonover
+# <http://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
+# includes themes for iTerm2, OSX Terminal.app, and Xresources. Others are also
+# available, i.e.:
+#
+#   Gnome Terminal <https://github.com/sigurdga/gnome-terminal-colors-solarized>
+#
+# Colors 0 through 15 in this theme are based on the 16 color positions defined
+# in the Xresources file distributed with the Solarized color palette.  Some
+# of the colors used are "named" in order to use the bold feature.  The color
+# "name" is based on the color's original name as the terminal understands it.
+#
+# Taskwarrior solarized-dark-256 theme created by Stefan A. Keel.

+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
+color.alternate=on color0
+color.header=color4
+color.footnote=color6
+color.warning=
+color.error=color6
+color.debug=color6
+
+# Task state
+color.completed=
+color.deleted=
 color.active=bold red
-color.alternate=on black #color0
-
+color.recurring=color4
+color.scheduled=
+color.until=
 color.blocked=color0 on color10
+color.blocking=color15 on color10

+# Project
+color.project.none=
+
+# Priority
+color.pri.H=bold blue #color14
+color.pri.M=bold yellow #color12
+color.pri.L=bold green #color11
+color.pri.none=
+
+# Tags
+color.tag.next=
+color.tag.none=
+color.tagged=color10
+
+# Due
+color.due=color9
+color.due.today=color1
+color.overdue=color5
+
+# Report: burndown
 color.burndown.done=color0 on color4
 color.burndown.pending=color0 on color1
 color.burndown.started=color0 on color9

+# Report: history
+color.history.add=color0 on color1
+color.history.delete=color0 on color3
+color.history.done=color0 on color10
+
+# Report: summary
+color.summary.background=on color0
+color.summary.bar=color0 on color6
+
+# Command: calendar
 color.calendar.due=color0 on color9
 color.calendar.due.today=color0 on color1
 color.calendar.holiday=color0 on color3
@@ -60,34 +105,12 @@ color.calendar.today=color0 on color4
 color.calendar.weekend=on color0
 color.calendar.weeknumber=color4

-color.debug=color6
-color.due=color9
-color.due.today=color1
-color.overdue=color5
-color.footnote=color6
-color.header=color4
-
-color.history.add=color0 on color1
-color.history.delete=color0 on color3
-color.history.done=color0 on color10
-
-color.pri.H=bold blue #color14
-color.pri.M=bold yellow #color12
-color.pri.L=bold green #color11
-color.pri.none=
-
-color.project.none=
-color.recurring=color4
-
-color.summary.background=on color0
-color.summary.bar=color0 on color6
-
+# Command: sync
 color.sync.added=color14
 color.sync.changed=color9
 color.sync.rejected=color13

-color.tag.none=
-color.tagged=color10
-
+# Command: undo
 color.undo.after=color2
 color.undo.before=color1
+
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@@ -1,23 +1,6 @@
 ################################################################################
-# Taskwarrior solarized-dark-256 theme created by Stefan A. Keel.
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
-# 
-# Colors used are based on the Solarized palette created by Ethan Schoonover 
-# <http://ethanschoonover.com/solarized>
-#
-# This theme was designed to work with a terminal application that is using
-# a Solarized "Light" color theme, otherwise colors will look odd. 
-# Solarized includes themes for iTerm2, OSX Terminal.app, and Xresources.
-# Others are also available, i.e.:
-# Gnome Terminal <https://github.com/sigurdga/gnome-terminal-colors-solarized>
-#
-# Colors 0 through 15 in this theme are based on the 16 color positions defined
-# in the Xresources file distributed with the Solarized color palette.  Some 
-# of the colors used are "named" in order to use the bold feature.  The color
-# "name" is based on the color's original name as the terminal understands it.
+# Copyright 2006 - 2015, 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
@@ -39,19 +22,81 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
+###############################################################################

-color=on
+# Colors used are based on the Solarized palette created by Ethan Schoonover
+# <http://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
+# includes themes for iTerm2, OSX Terminal.app, and Xresources. Others are also
+# available, i.e.:
+#
+#   Gnome Terminal <https://github.com/sigurdga/gnome-terminal-colors-solarized>
+#
+# Colors 0 through 15 in this theme are based on the 16 color positions defined
+# in the Xresources file distributed with the Solarized color palette.  Some
+# of the colors used are "named" in order to use the bold feature.  The color
+# "name" is based on the color's original name as the terminal understands it.
+#
+# Taskwarrior solarized-dark-256 theme created by Stefan A. Keel.

-color.active=bold red #color9
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
+
+# General decoration
+color.label=
+color.label.sort=
 color.alternate=on white #color7 (allows bold for alternate rows)
+color.header=color2
+color.footnote=color2
+color.warning=
+color.error=color2
+color.debug=color3

+# Task state
+color.completed=
+color.deleted=
+color.active=bold red #color9
+color.recurring=color4
+color.scheduled=
+color.until=
 color.blocked=on color14
+color.blocking=on color14

+# Project
+color.project.none=
+
+# Priority
+color.pri.H=bold black #color0
+color.pri.M=bold yellow #color11
+color.pri.L=bold cyan #color14
+color.pri.none=
+
+# Tags
+color.tag.next=
+color.tag.none=
+color.tagged=color14
+
+# Due
+color.due=color9
+color.due.today=color1
+color.overdue=color5
+
+# Report: burndown
 color.burndown.done=color0 on color4
 color.burndown.pending=color0 on color1
 color.burndown.started=color0 on color9

+# Report: history
+color.history.add=color0 on color1
+color.history.delete=color0 on color3
+color.history.done=color14 on color0
+
+# Report: summary
+color.summary.background=on color7
+color.summary.bar=color0 on color6
+
+# Command: calendar
 color.calendar.due=color7 on color9
 color.calendar.due.today=color7 on color1
 color.calendar.holiday=color7 on color3
@@ -60,34 +105,12 @@ color.calendar.today=color7 on color4
 color.calendar.weekend=on color7
 color.calendar.weeknumber=color14

-color.debug=color3
-color.due=color9
-color.due.today=color1
-color.overdue=color5
-color.footnote=color2
-color.header=color2
-
-color.history.add=color0 on color1
-color.history.delete=color0 on color3
-color.history.done=color14 on color0
-
-color.pri.H=bold black #color0
-color.pri.M=bold yellow #color11
-color.pri.L=bold cyan #color14
-color.pri.none=
-
-color.project.none=
-color.recurring=color4
-
-color.summary.background=on color7
-color.summary.bar=color0 on color6
-
+# Command: sync
 color.sync.added=color10
 color.sync.changed=color9
 color.sync.rejected=color13

-color.tag.none=
-color.tagged=color14
-
+# Command: undo
 color.undo.after=color2
 color.undo.before=color1
+
--- 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/i18n/CMakeLists.txt
+++ b/i18n/CMakeLists.txt
@@ -1,4 +0,0 @@
-cmake_minimum_required (VERSION 2.8)
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_DOCDIR}/i18n
-                                                FILES_MATCHING REGEX "tips.*"
-                                                               PATTERN "CMakeFiles" EXCLUDE)
--- a/i18n/tips.de-DE
+++ b/i18n/tips.de-DE
@@ -1,5 +0,0 @@
-%
-erster Tipp
-%
-zweiter Tipp
-%
--- a/i18n/tips.en-US
+++ b/i18n/tips.en-US
@@ -1,69 +0,0 @@
-%
-For bash users, try 'alias t=task' to save some keystrokes.
-%
-Have you tried 'task edit 1' to use your text editor to modify all aspects of
-task 1?
-%
-Did you know that 'task 1 wait:eom' will hide task 1 until the end of the
-month?  You can then see all waiting tasks with 'task waiting'.
-%
-Did you know that 'task 1 wait:' will restore a waiting task to pending status?
-%
-If you put 'default.command=list project:home' in your .taskrc file, then just
-running 'task' will automatically run 'task list project:home' for you.  Save
-some keystrokes!
-%
-If you edit your pending.data file, make sure that your text editor doesn't
-strip the trailing \n characters from the end of the file.
-%
-If you must edit your pending.data file, make sure that your text editor doesn't
-convert from a Unix to a DOS file encoding.
-%
-Do you have the latest version of task installed?  Check http://taskwarrior.org
-periodically for news of updates.  That feature you wanted might be ready...
-%
-Don't forget the online docs at http://taskwarrior.org/wiki/taskwarrior, and if
-you find errors, please let us know.  Then again, it is a wiki, so feel free to
-correct them yourself.
-%
-Don't forget the online docs at http://taskwarrior.org/wiki/taskwarrior, but if
-you cannot find documentation on a particular topic, either create a ticket
-requesting it, email support@taskwarrior.org asking for it, or start it
-yourself.
-%
-Did you know there are man pages for task?  Try 'man task', 'man taskrc',
-'man task-tutorial', 'man task-color' and 'man task-faq'.
-%
-Did you know there are several 256-color themes available for task?
-%
-Did you know that running 'task show' will perform various checks on your
-.taskrc file, looking for errors?
-%
-Are you making the most of color?  Try 'task color' to see what colors your
-system supports.
-%
-Are you using projects?  If you do, taskwarrior will keep track of the project
-completion percentage and report it to you whenever it changes.
-%
-Did you know you can list tasks that have priorities like 'task list
-priority.above:L'?
-%
-The http://tasktools.org/latest URL can tell you which is the latest version.
-%
-To make your task list clear and actionable, always describe it starting with a
-verb, like "call" or "clean" or "get".
-%
-Don't like the name of a command?  Create an alias.
-%
-You can choose whether your searches are case sensitive or not, by running
-'task config search.case.sensitive yes'
-%
-Back up your data files by making copies of the ~/.taskrc file and ~/.task
-directory.
-%
-Accidentally changed a task? The undo command makes it a breeze to recover from
-any inadvertent change -- even a deletion!
-%
-Want to see a list of all changes you have made to a task?  The info report will
-display a complete change history.
-%
--- a/i18n/tips.it-IT
+++ b/i18n/tips.it-IT
@@ -1,59 +0,0 @@
-%
-Se usi bash, puoi digitare qualche carattere in meno con 'alias t=task'.
-%
-Hai provato 'task edit 1' per modificare tutti gli aspetti del task 1 con il tuo
-editor preferito!
-%
-Lo sapevi che con 'task 1 wait:eom' puoi nascondere il task 1 fino alla fine del
-mese? Per listare tutti i task in attesa, usa 'task waiting'.
-%
-Lo sapevi che con 'task 1 wait:' puoi togliere un task dallo stato di attesa?
-%
-Se aggiungi la linea 'default.command=list project:home' al tuo file .taskrc,
-invocando 'task' invocherà automaticamente 'task list project:home' per te.
-Digita qualche carattere in meno!
-%
-Se editi il tuo file pending.data manualmente, assicurati che il tuo editor non
-rimuova il carattere \n alla fine del file.
-%
-Sei sicuro che la versione di task installata sia la più recente? Controlla
-periodicamente http://taskwarrior.org per novità e aggiornamenti: la
-funzionalità che aspettavi potrebbe essere pronta!
-%
-Non dimenticarti della documentazione online su
-http://taskwarrior.org/wiki/taskwarrior. Se trovi degli errori, puoi
-comunicarcelo o correggerli da te: è una wiki!
-%
-Lo sapevi che esistono le pagine del manuale di task? Prova con 'man task', 'man
-taskrc', 'man task-tutorial', 'man task-color' e 'man task-faq'.
-%
-Lo sapevi che ci sono svariati temi a 256 colori disponibili per task?
-%
-Lo sapevi che invocando 'task show' vengono eseguiti svariati controlli sul tuo
-file .taskrc e che alla fine viene presentato un report con gli errori?
-%
-Stai sfruttando al massimo i colori a tua disposizione? Prova ad invocare 'task
-color' per vedere i colori supportati dal tuo sistema.
-%
-Usi la funzionalità di task legata ai progetti? Se sì, taskwarrior tiene traccia
-del livello di completamento dei tuoi progetti e te lo notifica quando cambia.
-%
-Lo sapevi che puoi listare i tasks prioritari con un comando come 'task list
-priority.above:L'?
-%
-Hai la versione più aggiornata? Controllalo su http://tasktools.org/latest!
-%
-In una lista di task chiara e concisa le azioni iniziano sempre con un verbo,
-come "chiama", "pulisci", o "compera".
-%
-Non ti piace il nome di un comando? Crea un alias!
-%
-Puoi scegliere se le tue ricerche devono essere portate a termine in modo
-case-sensitive o meno, invocando 'task config search.case.sensitive [yes|no]'
-%
-Per fare un backup completo dei tuoi task è sufficiente fare una copia del file
-~/.taskrc e della directory ~/.task.
-%
-Hai modificato accidentalmente un task? Con il comando 'undo' è facile
-ripristinare un task -- anche dopo una cancellazione!
-%
--- a/i18n/tips.ja-JP
+++ b/i18n/tips.ja-JP
@@ -1,70 +0,0 @@
-%
-bashユーザーなら、'alias t=task'としてキー入力を減らしてみてください。
-%
-'task edit 1'とすると、タスク1のあらゆる要素をテキストエディタで編集
-できます。試してみましたか？
-%
-'task 1 wait:eom'とすると、月末までタスク1を隠す（待機させる）ことが
-できます。「待機」させたタスクは、'task waiting'で表示できます。
-%
-'task 1 wait:'で、待機状態のタスクを pending ステータスに変更できます。
-%
-設定ファイル .taskrc に 'default.command=list project:home' と書くと、
-単に 'task' を実行するだけで、自動的に 'task list project:home' した
-のと同じことになります。これでキー入力数を減らせますね！
-%
-もしpending.dataファイルを編集するなら、テキストエディタにファイル
-末尾にある、連続した \n 文字を勝手に削除させないようにしてください。
-%
-もしpending.dataファイルを編集するなら、テキストエディタが改行
-文字を勝手にUnixスタイルからDOSスタイルに変更しないように設定
-してください。
-%
-お使いのtaskは最新版ですか？　 http://taskwarrior.org/を定期的に
-確認し、アップデート情報を確認してください。この機能はいずれ実装
-されるかもしれません……。
-%
-オンラインにあるドキュメント http://taskwarrior.org/wiki/taskwarrior
-をお忘れなく。もし間違いを見つけたらお知らせください。ただ、これは
-wikiなので、ご自身で直して頂くことも可能です。
-%
-オンラインにあるドキュメント http://taskwarrior.org/wiki/taskwarrior
-をお忘れなく。ただ、必要な情報が見つからないかもしれません。そうした
-場合は、チケットでリクエストするか、support@taskwarrior.org にeメール
-で相談してください。
-%
-taskにはmanページがあります。'man task'、'man taskrc'、
-'man task-turorial'、'man task-color'、'man task-faq' が利用できます。
-%
-taskでは256色の色表示が可能です。ご存じでしたか？
-%
-'task show'を使っていますか？　これを使うことで、お使いの .taskrc
-ファイルに問題がないかを、様々な形でチェックできます。
-%
-もっと多くの色を利用したいですか？　'task color'を試してください。
-システム上でサポートされている各種カラー指定を表示します。
-%
-プロジェクト機能を使っていますか？　これを使えば、taskwarriorによる
-進捗率管理や、レポートを随時確認することができます。
-%
-一定の優先度のタスクのみ表示する場合、次のようにしてください。
-'task list priority.above:L'?
-%
-http://tasktools.org/latest というURLに、最新版が準備されています。
-%
-タスクリストを明確かつ「するべきこと」が分かるようにするために、
-動詞から書き出しましょう。「電話をかける：どこどこへ」「整理する」
-「調べる」といった形で。
-%
-コマンドの名前が気に入らない？　エイリアスを設定しましょう。
-%
-検索時、大文字小文字を区別するかどうかは任意に指定できます。
-'task config search.case.sensitive yes'で区別できます。
-%
-データファイルのバックアップを行う場合、~/.taskrcファイルと、
-~/.task ディレクトリを対象にしてください。
-%
-間違えてタスクを変更してしまったら？　undoコマンドを使うことで、
-あらゆる操作を一つ前に戻すことができます。もちろん削除もです！
-%
-
--- a/i18n/tips.sv-SE
+++ b/i18n/tips.sv-SE
@@ -1,14 +0,0 @@
-%
-För bash användare, med 'alias t=task' kan du spara på nedslagningar på tangentbordet.
-%
-Har du försökt att använda 'task edit 1' för att ändra alla aspekter av task 1 i din texteditor?
-%
-Med 'task 1 wait:eom' kan du göma task 1 fram till slutet av månaden. För att se
-alla task som väntar kan du använda 'task waiting'.
-%
-Visste du att 'task 1 wait:' återställa en väntande task till "peding" igen?
-%
-Skriv 'default.command=list project:home' i din .taskrc fil. När du sen använder
-'task' körs det en 'task list project:home' istäälet för dig. Spara på nedslagningar
-på tangetbordet.
-%
--- a/package-config/README
+++ b/package-config/README
@@ -25,8 +25,6 @@ You might also ask in the forums on taskwarrior.org if you
 have further questions.

 This file and the corresponding package build configuration files
-are released under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+are released under the terms of the MIT license.

 Please see the file COPYING in the main directory.
--- a/package-config/cygwin/CYGWIN-PATCHES/setup.hint
+++ b/package-config/cygwin/CYGWIN-PATCHES/setup.hint
@@ -1,10 +0,0 @@
-# setup.hint for task 1.8.1-1
-category: Utils
-requires: libncurses9 cygwin 
-sdesc: A command-line to do list manager
-ldesc: "Task is a command-line to do list manager.
-It has support for GTD functionality and includes
-the following features: tags, colorful tabular output,
-reports and graphs, lots of manipulation commands,
-low-level API, abbreviations for all commands and
-options, multiuser file locking, recurring tasks."
--- a/package-config/cygwin/CYGWIN-PATCHES/task-1.8.1-1.README
+++ b/package-config/cygwin/CYGWIN-PATCHES/task-1.8.1-1.README
@@ -1,45 +0,0 @@
-task 1.8.1-1
------------------------------------------
-
-A command-line to do list manager that can be used
-with the gtd system.
-
-Runtime requirements:
-  cygwin-1.5.25 or newer
-  libncurses
-
-Build requirements:
-  cygwin-1.5.25 or newer
-  gcc-3.4.4-1 or newer
-  libncurses-devel
-
-Canonical homepage:
-  http://taskwarrior.org
-
-Canonical download:
-  http://taskwarrior.org/download
-
-License:
-  GPLv2+
-
-Language:
-  C++
-
------------------------------------
-
-Build instructions:
-  unpack task-1.8.1-1-src.tar.bz2
-    if you use setup to install this src package,
-    it will be unpacked under /usr/src automatically
-  cd /usr/src/task-1.8.1-1
-  ./configure --prefix=/usr
-  make
-  make install
-
------------------------------------
-
-task was packaged for cygwin by
-Federico Hernandez <ultrafredde@gmail.com> and
-is licensed under the GPL
-
---- task-1.8.1-1 -- 2009-08-20 ----
--- a/package-config/cygwin/README
+++ b/package-config/cygwin/README
@@ -0,0 +1 @@
+howto package for cygwin
--- a/package-config/cygwin/task-1.8.1-1.patch
+++ b/package-config/cygwin/task-1.8.1-1.patch
@@ -1,63 +0,0 @@
-diff -Nrup task-1.8.1-1/CYGWIN-PATCHES/setup.hint task-1.8.1-1.cygwin/CYGWIN-PATCHES/setup.hint
--- task-1.8.1-1/CYGWIN-PATCHES/setup.hint	1970-01-01 01:00:00.000000000 +0100
-+++ task-1.8.1-1.cygwin/CYGWIN-PATCHES/setup.hint	2009-08-20 15:47:56.304750000 +0200
-@@ -0,0 +1,10 @@
-+# setup.hint for task 1.8.1-1
-+category: Utils
-+requires: libncurses9 cygwin 
-+sdesc: A command-line to do list manager
-+ldesc: "Task is a command-line to do list manager.
-+It has support for GTD functionality and includes
-+the following features: tags, colorful tabular output,
-+reports and graphs, lots of manipulation commands,
-+low-level API, abbreviations for all commands and
-+options, multiuser file locking, recurring tasks."
-diff -Nrup task-1.8.1-1/CYGWIN-PATCHES/task-1.8.1-1.README task-1.8.1-1.cygwin/CYGWIN-PATCHES/task-1.8.1-1.README
--- task-1.8.1-1/CYGWIN-PATCHES/task-1.8.1-1.README	1970-01-01 01:00:00.000000000 +0100
-+++ task-1.8.1-1.cygwin/CYGWIN-PATCHES/task-1.8.1-1.README	2009-08-20 15:47:44.320375000 +0200
-@@ -0,0 +1,45 @@
-+task 1.8.1-1
-+------------------------------------------
-+
-+A command-line to do list manager that can be used
-+with the gtd system.
-+
-+Runtime requirements:
-+  cygwin-1.5.25 or newer
-+  libncurses
-+
-+Build requirements:
-+  cygwin-1.5.25 or newer
-+  gcc-3.4.4-1 or newer
-+  libncurses-devel
-+
-+Canonical homepage:
-+  http://taskwarrior.org
-+
-+Canonical download:
-+  http://taskwarrior.org/download
-+
-+License:
-+  GPLv2+
-+
-+Language:
-+  C++
-+
-+------------------------------------
-+
-+Build instructions:
-+  unpack task-1.8.1-1-src.tar.bz2
-+    if you use setup to install this src package,
-+    it will be unpacked under /usr/src automatically
-+  cd /usr/src/task-1.8.1-1
-+  ./configure --prefix=/usr
-+  make
-+  make install
-+
-+------------------------------------
-+
-+task was packaged for cygwin by
-+Federico Hernandez <ultrafredde@gmail.com> and
-+is licensed under the GPL
-+
-+---- task-1.8.1-1 -- 2009-08-20 ----
--- a/package-config/cygwin/usr/share/doc/Cygwin/task-1.8.1-1.README
+++ b/package-config/cygwin/usr/share/doc/Cygwin/task-1.8.1-1.README
@@ -1,45 +0,0 @@
-task 1.8.1-1
------------------------------------------
-
-A command-line to do list manager that can be used
-with the gtd system.
-
-Runtime requirements:
-  cygwin-1.5.25 or newer
-  libncurses
-
-Build requirements:
-  cygwin-1.5.25 or newer
-  gcc-3.4.4-1 or newer
-  libncurses-devel
-
-Canonical homepage:
-  http://taskwarrior.org
-
-Canonical download:
-  http://taskwarrior.org/download
-
-License:
-  GPLv2+
-
-Language:
-  C++
-
------------------------------------
-
-Build instructions:
-  unpack task-1.8.1-1-src.tar.bz2
-    if you use setup to install this src package,
-    it will be unpacked under /usr/src automatically
-  cd /usr/src/task-1.8.1-1
-  ./configure --prefix=/usr
-  make
-  make install
-
------------------------------------
-
-task was packaged for cygwin by
-Federico Hernandez <ultrafredde@gmail.com> and
-is licensed under the GPL
-
---- task-1.8.1-1 -- 2009-08-20 ----
--- a/Show More
+++ b/Show More