Merge branch 'master' into 2.3.0

Conflicts: AUTHORS CMakeLists.txt INSTALL NEWS cmake.h.in doc/man/task-faq.5.in package-config/osx/README scripts/utils/verify_l10n src/API.h src/Config.cpp src/Context.cpp src/DOM.cpp src/Hooks.cpp src/TransportShell.h src/commands/CmdDiagnostics.cpp src/commands/CmdShell.cpp src/commands/CmdVersion.cpp src/en-US.h src/shell/Readline.h src/wcwidth6.cpp test/CMakeLists.txt test/color.uda.t test/duration.t.cpp test/hook.on-launch.t test/template.t test/uuid.t
2025-06-26 10:54:26 +02:00 · 2013-04-07 17:51:24 -04:00 · 2013-04-07 17:51:24 -04:00 · 8af0a7f3ba
commit 8af0a7f3ba
parent 066d2a54ad 0fb9a4e979
548 changed files with 13752 additions and 2435 deletions
--- a/19
+++ b/19
@ -11,6 +11,7 @@ contributions of the following people:
  Wim Schuermann     (Contributing Author)
  Owen Clarke        (Contributing Author)
  Louis-Claude Canon (Contributing Author)
  Scott Kostyshak    (Contributing Author)
 The following submitted code, packages or analysis, and deserve special thanks:
@ -74,10 +75,16 @@ The following submitted code, packages or analysis, and deserve special thanks:
  Oleksii Tsai
  Jörg Plate
  Markus Kuhn
  Scott Kostyshak
  Erik Wenzel
  Štěpán Henek
  Haitham Gad
  Fidel Mato
  Justin Forest
  Vincent Petithory
  Rainer Müller
  Jakub Wilk
  Russell Steicke
  YBSAR
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@ -159,4 +166,12 @@ suggestions:
  Jim B
  Robert Gill
  Robin Björklin
-
+  Jake Bell
  Florian Hollerweger
  Thomas Sullivan
  Tim None
  trHD
  Benjamin Weber
  alparo
  Roy Zuo
  Friedrich Heusler
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,4 +1,5 @@
 cmake_minimum_required (VERSION 2.8)
 set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 include (CheckFunctionExists)
 include (CheckStructHasMember)
@ -85,6 +86,7 @@ check_function_exists (srandom HAVE_SRANDOM)
 check_function_exists (timegm  HAVE_TIMEGM)
 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)
@ -113,6 +115,18 @@ else (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
  message ("-- libuuid not found, using internal uuid")
 endif (HAVE_UUID AND HAVE_UUID_UNPARSE_LOWER)
 # Set the package language.
 if (LANGUAGE)
  set (PACKAGE_LANGUAGE ${LANGUAGE})
 else (LANGUAGE)
  set (PACKAGE_LANGUAGE 1)
 endif (LANGUAGE)
 set (LANGUAGE_EN_US 1)
 set (LANGUAGE_ES_ES 2)
 set (LANGUAGE_DE_DE 3)
 set (LANGUAGE_FR_FR 4)
 message ("-- Configuring cmake.h")
 configure_file (
  ${CMAKE_SOURCE_DIR}/cmake.h.in
@ -128,6 +142,9 @@ add_subdirectory (scripts)
 if (EXISTS test)
  add_subdirectory (test EXCLUDE_FROM_ALL)
 endif (EXISTS test)
 if (EXISTS performance)
  add_subdirectory (performance EXCLUDE_FROM_ALL)
 endif (EXISTS performance)
 set (doc_FILES NEWS ChangeLog README INSTALL AUTHORS COPYING)
 foreach (doc_FILE ${doc_FILES})
@ -139,8 +156,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"
+                                "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$"
-                                "Makefile$" "test" "package-config" "misc/*"
+				"test" "package-config" "misc/*" "src/task$" "src/libtask.a"
-                                "src/task$" "src/libtask.a" "auto.h$"
+				"src/columns/libcolumns.a" "src/commands/libcommands.a"
-                                "/\\.gitignore" "/\\.git/" "swp$")
+                                "auto.h$" "/\\.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-2013, 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/104
+++ b/104
@ -1,14 +1,26 @@
 ------ current release ---------------------------
-2.2.0 () -
+2.2.0 (2013-04-07) 05f7948f7e70d7be3642bdc336faace52eaa9dfb
 Features
 + Added Feature #685, which provides a 'blocking' report, and new color rule
   (thanks to Michelle Crane).
 + Added Feature #953, which includes the total number of blocked and blocking
   tasks to the 'statistics' command output (thanks to T. Charles Yun).
 + Added Feature #1039, which adds new date shortcuts, 'socm' and 'eocm',
   meaning start and end of current month (thanks to Thomas Sullivan,
   Louis-Claude Canon).
 + Added Feature #1061, which allows the 'columns' command to use a search
   string for the column name (thanks to Uli Martens).
 + Added Feature #1069, which gives a clearer error when a UDA
   is added without the uda.<uda-name>.type variable.
 + Added Feature #1099, which supports the 'color.uda.<uda-name>' color rule
   (thanks to Florian Hollerweger).
 + Added Feature #1124, which provides a '_show' command that displays all
   configuration defaults and settings, for use by third-party software (thanks
   to Jake Bell).
 + Added feature #1147, applying patch to display duration of each activity
   session (thanks to Justin Forest).
 + The 'projects' command now outputs abstract parents and reduces
   repetition by not printing parent names in front of children names.
 + Added framework for testing bash autocompletion.
@ -17,13 +29,24 @@ Features
 + Removed deprecated 'fg:' and 'bg:' attributes.
 + The 'diagnostics' command now reports libuuid details.
 + New characters for parsing and formating dates ('n', 's' and 'v').
- + Virtual tags.
+ + Virtual tags (BLOCKED, UNBLOCKED, BLOCKING, DUE, DUETODAY, TODAY, OVERDUE,
   ACTIVE, SCHEDULED, CHILD, UNTIL, WAITING and ANNOTATED).
 + New 'modified' attribute, which contains the most recent modification date,
   if a modification has occurred.
 + Fixed the mechanism used for selecting translations (thanks to Fidel Mato).
 + Added new export script: export-tsv.pl.
 + Added the configuration variable 'print.empty.columns'.
 + The 'push' and 'pull' commands now properly distinguish between a missing
   transport utility and other errors (thanks to Russell Steicke).
 + Removed support for Lua extensions.
 + Added tips.fr-FR (thanks to YBSAR).
 + Added tips.es-ES (thanks to Fidel Mato).
 Bugs
- + Fixed bug #1031, which kept expanding aliases after the '--' operator (thanks
+ + Fixed bug #642, so that the default 'data.location=~/.task' preserves the
-   to Jim B).
+   '~', leading to more portable .taskrc files (thanks to alparo).
 + Fixed bug #947, #1031, which kept expanding aliases after the '--' operator
   (thanks to Jim B).
 + Fixed bug #1038, which prints blank lines with bulk changes and when the
   verbose attributes does not specify it. Lines do a better separation between
   each changes also.
@ -32,18 +55,91 @@ Bugs
 + Fixed bug #1043, where aliases were not recognized by bash autocompletion.
 + Fixed bug #1044, where 'task projects' considers newly deleted tasks and
   provides an incorrect summary.
 + Fixed bug #1047, which caused extra commas in exported JSON when UDA orphans
   were present (thanks to Thomas Sullivan).
 + Fixed bug #1048, which segfaulted rather than complain about syntax (thanks
   to Bryce Harrington, Štěpán Henek).
 + Fixed bug #1053, where ' characters were not escaped by export-csv.pl (thanks
   to John Florian).
 + Fixed bug #1056, where CmdSummary did not print abstract parents.
 + Fixed bug #1059, where CmdEdit was running garbage collection.
 + Fixed bug #1060, where an error was not thrown correctly.
 + Fixed bug #1063, so that numeric UDA fields are now sortable (thanks to Max
   Muller).
 + Fixed bug #1065, where CmdShow issued messages in incorrect situations.
 + Partially fixed #1083, which showed 'task 0 ...' when modifying a non-
   pending task (thanks to Aikido Guy).
 + Fixed bug #1087, which gave incorrect task/line counts under certain
   conditions.
 + Fixed bug #1091, allowing filters to use 'urgency.over:4.5'.
 + Fixed bug #1110, which did not treat 'status:Completed' the same
   as 'status:completed' (thanks to Aikido Guy).
 + Fixed bug #1118, which dropped changes after edits were rejected (thanks to
   Ben Boeckel).
 + Fixed bug #1123, which caused the undo of a 'log' command to corrupt the data
   file (thanks to Tim None).
 + Fixed bug #1128, which caused 'age' columns to be right-justified instead of
   left-justified (thanks to Steve Rader).
 + Fixed bug #1136, #1177, which incorrectly line-wrapped tasks with annotations
   (thanks to Steve Rader, T. Charles Yun).
 + Fixed bug #1135, #1137, which caused file locks to be non-blocking (thanks
   to Steve Rader).
 + Fixed bug #1150, which referenced deprecated features in the tutorial man
   page (thanks to Benjamin Weber).
 + Fixed bug #1154, which now allows priorities to be specified in any case.
 + Fixed bug #1178, which included binary libraries in the released source
   package (thanks to Jakub Wilk).
 + Fixed bug #1181, where single-character columns were often rendered using
   widths larger than 1 (thanks to Max Muller).
 + Fixed bug #1183, correcting error message typos (thanks to Jakub Wilk).
 + Fixed bug #1184, correcting man page formatting (thanks to Jakub Wilk).
 + Fixed bug #1185, correcting man page install location for out-of-tree
   builds (thanks to Jakub Wilk).
 + Fixed bug #1189, which caused wide Asian UTF8 characters to be measured as
   narrow characters (thanks to Roy Zuo).
 + Fixed bug #1191, which kept file locks active for longer than necessary,
   and caused the 'execute' command to be considered a 'write' command.
 + Fixed bug #1192, which failed to expand braces internally, as POSIX /bin/sh
   does not do {} expansion, thereby causing push/pull errors (thanks to Russell
   Steicke).
 + Fixed bug #1194, so that $HOME has precedence over the passwd db when looking
   for the user's home directory (thanks to Jakub Wilk).
 + Fixed bug #1199, where 'stat' was used instead of 'lstat' (thanks to Jakub
   Wilk).
 + Fixed bug #1200, where directory removal didn't handle d_type==DT_UNKNOWN
   (thanks to Jakub Wilk).
 + Fixed bug #1209, spelling mistake in reference page (thanks to Friedrich
   Heusler).
 + Fixed bug #1210 so that widths are taken from localized strings instead of
   hardcoded.
 + Fixed bug #1218 so that description columns minimum width is calculated
   correctly.
 + Improved hyphenation by splitting on commas (even if no whitespace after).
   Leads to better output of, for example, 'task show', where comma-separated
   lists are common.
 + No more bash completion of, for example, 'projABC:', or of 'proj:' if
   abbreviation.minimum is greater than 4.
 + Fixed bug where shadow files are not properly created when there is a missing
   .taskrc file (thanks to Pietro Cerutti).
 + Fixed bug with 'socm' date calculation that failed on some days, by
   simplifying the implementation.
 + Fix a bug where 'print.empty.columns=no' resulted in never printing the
   project column.
 + Integrated latest UTF8 character width calculations from Markus Kuhn.
 + Fixed bug where localized UTF8 strings were not properly substr'd (thanks to
   Fidel Mato).
 + Fixed a bug where the bash completion script was causing gc() to be run.
 + Fixed manpages that were not installed when running an out-of-source build
   (thanks to Vincent Petithory).
 + Added missing localized confirmation strings (thanks to Rainer Müller).
 + Fixed bug that added an extra newline after setting the terminal title
   (thanks to Rainer Müller).
 + Fixed a bug where the terminal title was tried to be set without a tty
   (thanks to Rainer Müller).
 + Fixed hook tests to work on released code (thanks to Jakub Wilk).
 + Fixed bug where arguments passed to 'task execute' needed double escaping.
 + Fixed a bug so that the report filter order is preserved, to enable an
   optimization that was being skipped.
 ------ old releases ------------------------------
--- a/52
+++ b/52
@ -14,16 +14,14 @@ General Statement
    quickest way to get help, or confirm a bug.
  - Review documentation: there are man pages, wiki articles, tutorials and so
-    on, and these may contain errors, or more importantly, they may not convey
+    on, and these may contain errors, or they may not convey ideas in the best
-    ideas in the best way.  Perhaps you can help improve it.
+    way.  Perhaps you can help improve it.
-  - Take a look at the bug database.  It is the nature of software to contain
+  - Take a look at the bug database, and help triage the bug list.  This is a
-    bugs, and there is a continuous effort to fix them.  Looking at open bugs
+    review process that involves confirming bugs, providing additional data,
-    and confirming them, perhaps determining that it is already fixed, or just
+    information or analysis.  Bug triage is very useful and much needed.
    adding clarifying information are all very useful contributions and much
    needed.
-  - Fix a bug.  For this you'll need C++ and git skills, but this is one of
+  - 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.
@ -44,9 +42,16 @@ General Statement
    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://tasktools.org/tinderbox
    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. It's all good.
+  - Encouragement.  Tell us what works for you, and what doesn't.  It's all
    good.
  Following are specific areas that could use some attention.
@ -54,9 +59,7 @@ 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.
  - 'shell' command.  It will migrate to become an external script.
  - Shadow file support in core.  It will migrate to become an external script.
  - Support for 'fg:' and 'bg:' attributes.
 New Code Needs
  This is code that needs to be written, usually down at the C++ function/method
@ -80,11 +83,6 @@ New Code Needs
    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.
  - Need an external implementation equivalent to, or better than the 'shell'
    command.  We are hoping to move the weak 'shell' command out of the core,
    which means it can be developed separately.  There are several pending
    feature requests for this, including creative prompts, readline and auto-
    clear.
  - Need an external implementation equivalent to, or better than the 'shadow
    file' feature.  Simply because shadow file capability *can* be implemented
    outside the core code, we want to make it be that way.
@ -138,7 +136,7 @@ Unit Tests Needed
     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:
+  Once this file is created, you can see the failing tests using this script:
    cd task.git/test
    ./problems
@ -153,7 +151,8 @@ Unit Tests Needed
  - 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.
+    functionality is working, and the file containing them should be called
    basic.t.
  - None of the current unit tests remove the 'extensions' directory, and they
    all should.
  - Test propagation of modifications to recurring tasks.
@ -161,11 +160,13 @@ Unit Tests Needed
  - 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.
+    tests themselves, rather than in Taskwarrior.
-  * Note that running the unit tests require the Perl JSON module to be
+  * Note that running the unit tests 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.
@ -178,14 +179,15 @@ Work in Progress
 Current Codebase Condition
  'master' branch:
-    - 2.0.0 release, current, locked.
+    - 2.2.0 Current release, locked.
  '2.0.1' branch (to be released as 2.1.0):
    - All current development.
  '2.2.0' branch:
-    - Future development effort.
+    - Current release.  Locked.
  '2.3.0' branch:
    - Current development branch with sync features, and new tasksh.
 ---
 2012-05-12 Added general statement about how to contribute.
 2013-03-31 Updated branch info.
--- a/17
+++ b/17
@ -152,12 +152,11 @@ Test Suite
  There are currently over 5,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
+  Taskwarrior uses flod software to automate continuous integration across
-  approaches, the frequency is boosted so there are always current results to be
+  many platforms. Code changes are automatically detected, propagated, built and
-  found.  Between releases the tinderbox runs daily.  It is intended that this
+  tested on a variety of participating platforms. Grid testing results are here:
  be modified for continuous integration, so it runs once per commit.
-    http://tasktools.org/tinderbox/task.html
+    http://tasktools.org/tinderbox/taskwarrior.html
  When making code changes, it is important that the test suite be run to verify
  that functionality was not broken.
@ -189,9 +188,9 @@ Patches
    - 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
+  A patch may be rejected for not following the above guidelines, and more.
-  may be accepted and modified depending on work load and mood.  It is possible
+  Bad patches may be accepted and modified depending on work load and mood.  It
-  that a patch may be rejected because it conflicts in some way with plans or
+  is possible that a patch may be rejected because it conflicts in some way with
-  upcoming changes.
+  plans or upcoming changes.
 ---
--- a/5
+++ b/5
@ -12,6 +12,9 @@ from source.
 More information on cmake can be obtained at http://cmake.org
 It is HIGHLY RECOMMENDED that you build with a library that provides uuid_*
 functions, such as libuuid.
 Basic Installation
 ------------------
@ -139,7 +142,7 @@ Darwin, 32bit
 Troubleshooting
 ---------------
-If you've recently made changes to dependencies (by reinstalling libuuid, 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
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 taskwarrior - a command line task list manager.
-Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+Copyright 2006-2013, 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/6
+++ b/6
@ -23,9 +23,9 @@ Newly deprecated features in taskwarrior 2.3.0
 Taskwarrior has been built and tested on the following configurations:
-  * OS X 10.7 Lion, 10.6 Snow Leopard
+  * OS X 10.8 Mountain Lion and 10.7 Lion
-  * Fedora 17 Beefy Miracle and 16 Verne
+  * Fedora 18 Spherical Cow and 17 Beefy Miracle
-  * Ubuntu 12.04 Precise Pangolin and 11.10 Oneiric Ocelot
+  * Ubuntu 12.10 Quantal Quetzal and 12.04 Precise Pangolin
  * Debian 6.0 Squeeze (stable)i and 5.0 Lenny (oldstable) plus Sid (testing)
  * Slackware 13.37
  * Arch Linux
--- a/cmake.h.in
+++ b/cmake.h.in
@ -15,14 +15,11 @@
 #define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_DOCDIR}/rc"
 /* Localization */
-#define PACKAGE_LANGUAGE  1
+#define PACKAGE_LANGUAGE  ${PACKAGE_LANGUAGE}
-#define LANGUAGE_EN_US 1
+#define LANGUAGE_EN_US ${LANGUAGE_EN_US}
-#define LANGUAGE_ES_ES 2
+#define LANGUAGE_ES_ES ${LANGUAGE_ES_ES}
-
+#define LANGUAGE_DE_DE ${LANGUAGE_DE_DE}
-/*
+#define LANGUAGE_FR_FR ${LANGUAGE_FR_FR}
 Override PACKAGE_LANGUAGE, then
 #define LANGUAGE_XX_YY 2
 */
 /* git information */
 #cmakedefine HAVE_COMMIT
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -7,9 +7,9 @@ foreach (man_FILE ${man_FILES})
    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})
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@ -1,4 +1,4 @@
-.TH task-color 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
+.TH task-color 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task-color \- A color tutorial for the taskwarrior command line todo manager.
@ -243,7 +243,7 @@ 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.
@ -304,7 +304,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 \- 2013 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
--- a/doc/man/task-faq.5.in
+++ b/doc/man/task-faq.5.in
@ -1,4 +1,4 @@
-.TH task-faq 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
+.TH task-faq 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task-faq \- A FAQ for the task(1) command line todo manager.
@ -335,7 +335,7 @@ This will remove the second annotation - the first non-exact match.
 .B Q: How do I show tasks completed on a certain day?
 The day in question has to be boxed by a range, like this:
-    task end.after:3/29/2012 end.before:3/30/2012 completed
+    task end.after:3/29/2013 end.before:3/30/2013 completed
 Note that a single date, such as 3/29/2012 does not refer to a whole day, but
 to a single point in time, 3/20/2012 0:00:00.
@ -355,7 +355,7 @@ There are lots of ways.  Here are some:
 - Fix bugs
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@ -1,4 +1,4 @@
-.TH task-sync 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
+.TH task-sync 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task-sync \- A tutorial for the task(1) data synchronization capabilities.
@ -352,10 +352,10 @@ unable to merge.  The change transactions stored in the undo.data file are
 used for synchronization.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
 The sync capabilities were written by J. Schlatow.
-Parts copyright (C) 2010 - 2012 J. Schlatow.
+Parts copyright (C) 2010 - 2013 J. Schlatow.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
--- a/doc/man/task-tutorial.5.in
+++ b/doc/man/task-tutorial.5.in
@ -1,4 +1,4 @@
-.TH task-tutorial 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
+.TH task-tutorial 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task-tutorial \- A tutorial for the task(1) command line todo manager.
@ -1096,49 +1096,6 @@ ID Project Pri Due Active Age     Description
 What you see is the result of a set of color rules being applied to the tasks.
 There is a hierarchy of color rules that colorize a task based on the metadata.
 Here is an example of an explicit override to the color rules where a specific
 task is given a red background.
 .RS
 $ task 1 modify bg:on_red
 .br
 modified 1 task.
 .br
 $ task list
 .br
 .br
 ID Project Pri Due Active Age     Description
 .br
 -- ------- --- --- ------ ------- ----------------------------------
 .br
 1 party   H                 1 hr Select a free weekend in November
 .br
                                  10/16/2010 the 13th looks good
 .br
 2 party   H                 1 hr Select and book a venue
 .br
 5 party   H              59 mins Design invitations
 .br
 8                        33 mins Select some Music for after dinner
 .br
 7 home                   50 mins Pay rent at the end of the month
 .br
 3 party                     1 hr Mail invitations
 .br
 4 party                     1 hr Select a caterer
 .br
 6 party                  59 mins Print invitations
 .br
 .br
 8 tasks
 .br
 $ task 1 modify bg:
 .br
 Modified 1 task.
 .RE
 Taskwarrior supports 256 colors on certain terminal emulators, and this shows
 the range of colors available.  Note that your terminal may show fewer colors.
@ -3124,7 +3081,7 @@ $ task help
 .RE
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
 This man page was originally written by Federico Hernandez, and has been modified and supplemented by Paul Beckingham.
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@ -1,4 +1,4 @@
-.TH task 1 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
+.TH task 1 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 task \- A command line todo manager.
@ -144,8 +144,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
+If a year is provided, such as '2013', then that full year is shown.  If both
-a month and a year are specified ('6 2012') then the months displayed begin at
+a month and a year are specified ('6 2013') 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.
@ -155,9 +155,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
@ -452,7 +453,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]
@ -488,6 +491,11 @@ 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
@ -552,6 +560,27 @@ 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
    DUE          Matches if the task is due
    DUETODAY     Matches if the task is due today
    TODAY        Matches if the task is due today
    OVERDUE      Matches if the task is overdue
    ACTIVE       Matches if the task is started
    SCHEDULED    Matches if the task is scheduled
    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
 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.
@ -789,7 +818,7 @@ task ... due:7/14/2008
 .TP
 ISO-8601
-task ... due:20120314T223000Z
+task ... due:20130314T223000Z
 .TP
 Relative wording
@ -973,7 +1002,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.
@ -1030,7 +1060,7 @@ The file that contains the completed ("done") tasks.
 The file that contains information needed by the "undo" and "merge" commands.
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
 Taskwarrior is distributed under the MIT license. See
 http://www.opensource.org/licenses/mit-license.php for more information.
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@ -1,4 +1,4 @@
-.TH taskrc 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
+.TH taskrc 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
 .SH NAME
 taskrc \- Configuration file for the task(1) command
@ -347,6 +347,11 @@ May be yes or no, and determines whether the 'tags' command lists all the tag
 names you have used, or just the ones used in active tasks.  The default value is
 "no".
 .TP
 .B print.empty.columns=no
 May be yes or no, and determines whether columns with no data for any task are
 printed.  Defaults to no.
 .TP
 .B search.case.sensitive=yes
 May be yes or no, and determines whether keyword lookup and substitutions on the
@ -504,7 +509,7 @@ D  two-digit day,         for example 01 or 30
 .br
 M  two-digit month,       for example 01 or 12
 .br
-Y  four-digit year,       for example 2009 or 2012
+Y  four-digit year,       for example 2009 or 2013
 .br
 a  short name of weekday, for example Mon or Wed
 .br
@ -584,9 +589,9 @@ field that is set.  Otherwise, they are set to the corresponding values of
 .RS
 .RS
 .br
-8/1/2012  with m/d/Y   implies August 1, 2012 at midnight (inferred)
+8/1/2013  with m/d/Y   implies August 1, 2013 at midnight (inferred)
 .br
-8/1 20:40 with m/d H:N implies August 1, 2012 (inferred) at 20:40
+8/1 20:40 with m/d H:N implies August 1, 2013 (inferred) at 20:40
 .RE
 .RE
@ -841,6 +846,11 @@ Colors any task assigned to project X.
 Colors any task where the description or any annotation contains X.
 .RE
 .TP
 .B color.uda.X=on green
 Colors any taks that has the user defined attribute X.
 .RE
 .TP
 .B color.error=green
 Colors any of the error messages.
@ -964,7 +974,7 @@ Colors the output of the merge command.
 .RE
 .TP
-.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,recurring,pri,tagged,completed,deleted
+.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted
 .RS
 This setting specifies the precedence of the color rules, from highest to
 lowest.  Note that the prefix 'color.' is omitted (for brevity), and that any
@ -1334,7 +1344,7 @@ of a task.
 .RE
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
 This man page was originally written by Federico Hernandez.
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/doc/rc/dark-violets-256.theme
+++ b/doc/rc/dark-violets-256.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,42 @@
 ###############################################################################
 holiday.be-BY1.name=Новы Год
-holiday.be-BY1.date=20120101
+holiday.be-BY1.date=20130101
 holiday.be-BY2.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY2.date=20120107
+holiday.be-BY2.date=20130107
 holiday.be-BY3.name=Міжнародны жаночы дзень
-holiday.be-BY3.date=20120803
+holiday.be-BY3.date=20130803
 holiday.be-BY4.name=Пасха(праваслаўная)
-holiday.be-BY4.date=20120415
+holiday.be-BY4.date=20130505
 holiday.be-BY5.name=Радуніца
-holiday.be-BY5.date=20120424
+holiday.be-BY5.date=20130514
 holiday.be-BY6.name=Свята працы
-holiday.be-BY6.date=20120501
+holiday.be-BY6.date=20130501
 holiday.be-BY7.name=Дзень Перамогі
-holiday.be-BY7.date=20120509
+holiday.be-BY7.date=20130509
 holiday.be-BY8.name=Дзень незалежнаці
-holiday.be-BY8.date=20120703
+holiday.be-BY8.date=20130703
 holiday.be-BY9.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY9.date=20121107
+holiday.be-BY9.date=20131107
 holiday.be-BY10.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY10.date=20121225
+holiday.be-BY10.date=20131225
 holiday.be-BY11.name=Новы Год
-holiday.be-BY11.date=20130101
+holiday.be-BY11.date=20140101
 holiday.be-BY12.name=Раство Хрыстова(праваслаўнае)
-holiday.be-BY12.date=20130107
+holiday.be-BY12.date=20140107
 holiday.be-BY13.name=Міжнародны жаночы дзень
-holiday.be-BY13.date=20130803
+holiday.be-BY13.date=20140803
 holiday.be-BY14.name=Пасха(праваслаўная)
-holiday.be-BY14.date=20130505
+holiday.be-BY14.date=20140420
 holiday.be-BY15.name=Радуніца
-holiday.be-BY15.date=20130514
+holiday.be-BY15.date=20140529
 holiday.be-BY16.name=Свята працы
-holiday.be-BY16.date=20130501
+holiday.be-BY16.date=20140501
 holiday.be-BY17.name=Дзень Перамогі
-holiday.be-BY17.date=20130509
+holiday.be-BY17.date=20140509
 holiday.be-BY18.name=Дзень незалежнаці
-holiday.be-BY18.date=20130703
+holiday.be-BY18.date=20140703
 holiday.be-BY19.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.be-BY19.date=20131107
+holiday.be-BY19.date=20141107
 holiday.be-BY20.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.be-BY20.date=20131225
+holiday.be-BY20.date=20141225
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,54 @@
 ###############################################################################
 holiday.cs-CZ1.name=Nový rok
-holiday.cs-CZ1.date=20120101
+holiday.cs-CZ1.date=20130101
 holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ2.date=20120101
+holiday.cs-CZ2.date=20130101
 holiday.cs-CZ3.name=Velikonoční pondělí
-holiday.cs-CZ3.date=20120409
+holiday.cs-CZ3.date=20130401
 holiday.cs-CZ4.name=Svátek práce
-holiday.cs-CZ4.date=20120501
+holiday.cs-CZ4.date=20130501
 holiday.cs-CZ5.name=Den vítězství
-holiday.cs-CZ5.date=20120508
+holiday.cs-CZ5.date=20130508
 holiday.cs-CZ6.name=Den slovanských věrozvěstů
-holiday.cs-CZ6.date=20120705
+holiday.cs-CZ6.date=20130705
 holiday.cs-CZ7.name=Den upálení mistra Jana Husa
-holiday.cs-CZ7.date=20120706
+holiday.cs-CZ7.date=20130706
 holiday.cs-CZ8.name=Den české státnosti
-holiday.cs-CZ8.date=20120928
+holiday.cs-CZ8.date=20130928
 holiday.cs-CZ9.name=Den vzniku samostatného československého státu
-holiday.cs-CZ9.date=20121028
+holiday.cs-CZ9.date=20131028
 holiday.cs-CZ10.name=Den boje za svobodu a demokracii
-holiday.cs-CZ10.date=20121117
+holiday.cs-CZ10.date=20131117
 holiday.cs-CZ11.name=Štědrý den
-holiday.cs-CZ11.date=20121224
+holiday.cs-CZ11.date=20131224
 holiday.cs-CZ12.name=1. svátek vánoční
-holiday.cs-CZ12.date=20121225
+holiday.cs-CZ12.date=20131225
 holiday.cs-CZ13.name=2. svátek vánoční
-holiday.cs-CZ13.date=20121226
+holiday.cs-CZ13.date=20131226
 holiday.cs-CZ14.name=Nový rok
-holiday.cs-CZ14.date=20130101
+holiday.cs-CZ14.date=20140101
 holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
-holiday.cs-CZ15.date=20130101
+holiday.cs-CZ15.date=20140101
 holiday.cs-CZ16.name=Velikonoční pondělí
-holiday.cs-CZ16.date=20130401
+holiday.cs-CZ16.date=20140421
 holiday.cs-CZ17.name=Svátek práce
-holiday.cs-CZ17.date=20130501
+holiday.cs-CZ17.date=20140501
 holiday.cs-CZ18.name=Den vítězství
-holiday.cs-CZ18.date=20130508
+holiday.cs-CZ18.date=20140508
 holiday.cs-CZ19.name=Den slovanských věrozvěstů
-holiday.cs-CZ19.date=20130705
+holiday.cs-CZ19.date=20140705
 holiday.cs-CZ20.name=Den upálení mistra Jana Husa
-holiday.cs-CZ20.date=20130706
+holiday.cs-CZ20.date=20140706
 holiday.cs-CZ21.name=Den české státnosti
-holiday.cs-CZ21.date=20130928
+holiday.cs-CZ21.date=20140928
 holiday.cs-CZ22.name=Den vzniku samostatného československého státu
-holiday.cs-CZ22.date=20131028
+holiday.cs-CZ22.date=20141028
 holiday.cs-CZ23.name=Den boje za svobodu a demokracii
-holiday.cs-CZ23.date=20131117
+holiday.cs-CZ23.date=20141117
 holiday.cs-CZ24.name=Štědrý den
-holiday.cs-CZ24.date=20131224
+holiday.cs-CZ24.date=20141224
 holiday.cs-CZ25.name=1. svátek vánoční
-holiday.cs-CZ25.date=20131225
+holiday.cs-CZ25.date=20141225
 holiday.cs-CZ26.name=2. svátek vánoční
-holiday.cs-CZ26.date=20131226
+holiday.cs-CZ26.date=20141226
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,26 @@
 ###############################################################################
 holiday.da-DK1.name=Nytårsdag
-holiday.da-DK1.date=20120101
+holiday.da-DK1.date=20130101
 holiday.da-DK2.name=Palmesøndag
-holiday.da-DK2.date=20120401
+holiday.da-DK2.date=20130324
 holiday.da-DK3.name=Skærtorsdag
-holiday.da-DK3.date=20120405
+holiday.da-DK3.date=20130328
 holiday.da-DK4.name=Langfredag
-holiday.da-DK4.date=20120406
+holiday.da-DK4.date=20130329
 holiday.da-DK5.name=Påskedag
-holiday.da-DK5.date=20120408
+holiday.da-DK5.date=20130331
 holiday.da-DK6.name=Anden påskedag
-holiday.da-DK6.date=20120409
+holiday.da-DK6.date=20130401
 holiday.da-DK7.name=Store bededag
-holiday.da-DK7.date=20120504
+holiday.da-DK7.date=20130426
 holiday.da-DK8.name=Kristi himmelfartsdag
-holiday.da-DK8.date=20120517
+holiday.da-DK8.date=20130509
 holiday.da-DK9.name=Pinsedag
-holiday.da-DK9.date=20120527
+holiday.da-DK9.date=20130519
 holiday.da-DK10.name=Anden pinsedag
-holiday.da-DK10.date=20120528
+holiday.da-DK10.date=20130520
 holiday.da-DK11.name=Juledag
-holiday.da-DK11.date=20121225
+holiday.da-DK11.date=20131225
 holiday.da-DK12.name=Anden juledag
-holiday.da-DK12.date=20121226
+holiday.da-DK12.date=20131226
 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
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,48 @@
 ###############################################################################
 holiday.de-AT1.name=Neujahr
-holiday.de-AT1.date=20120101
+holiday.de-AT1.date=20130101
 holiday.de-AT2.name=Heilige drei KÃ¶nige
-holiday.de-AT2.date=20120106
+holiday.de-AT2.date=20130106
 holiday.de-AT3.name=Josef (K, St, T, V)
-holiday.de-AT3.date=20120319
+holiday.de-AT3.date=20130319
 holiday.de-AT4.name=Karfreitag
-holiday.de-AT4.date=20120406
+holiday.de-AT4.date=20130329
 holiday.de-AT5.name=Ostersonntag
-holiday.de-AT5.date=20120408
+holiday.de-AT5.date=20130331
 holiday.de-AT6.name=Ostermontag
-holiday.de-AT6.date=20120409
+holiday.de-AT6.date=20130401
 holiday.de-AT7.name=Staatsfeiertag
-holiday.de-AT7.date=20120501
+holiday.de-AT7.date=20130501
 holiday.de-AT8.name=Florian (O)
-holiday.de-AT8.date=20120504
+holiday.de-AT8.date=20130504
 holiday.de-AT9.name=Christi Himmelfahrt
-holiday.de-AT9.date=20120517
+holiday.de-AT9.date=20130509
 holiday.de-AT10.name=Pfingstsonntag
-holiday.de-AT10.date=20120527
+holiday.de-AT10.date=20130519
 holiday.de-AT11.name=Pfingstmontag
-holiday.de-AT11.date=20120528
+holiday.de-AT11.date=20130520
 holiday.de-AT12.name=Fronleichnam
-holiday.de-AT12.date=20120607
+holiday.de-AT12.date=20130530
 holiday.de-AT13.name=Mariä Himmelfahrt
-holiday.de-AT13.date=20120815
+holiday.de-AT13.date=20130815
 holiday.de-AT14.name=Rupert (S)
-holiday.de-AT14.date=20120924
+holiday.de-AT14.date=20130924
 holiday.de-AT15.name=Tag der Volksabstimmung (K)
-holiday.de-AT15.date=20121010
+holiday.de-AT15.date=20131010
 holiday.de-AT16.name=Allerheiligen
-holiday.de-AT16.date=20121101
+holiday.de-AT16.date=20131101
 holiday.de-AT17.name=Martin (B)
-holiday.de-AT17.date=20121111
+holiday.de-AT17.date=20131111
 holiday.de-AT18.name=Leopold (W, N)
-holiday.de-AT18.date=20121115
+holiday.de-AT18.date=20131115
 holiday.de-AT19.name=Mariä Empfängnis
-holiday.de-AT19.date=20121208
+holiday.de-AT19.date=20131208
 holiday.de-AT20.name=Heiliger Abend
-holiday.de-AT20.date=20121224
+holiday.de-AT20.date=20131224
 holiday.de-AT21.name=Christtag
-holiday.de-AT21.date=20121225
+holiday.de-AT21.date=20131225
 holiday.de-AT22.name=Stefanitag
-holiday.de-AT22.date=20121226
+holiday.de-AT22.date=20131226
 holiday.de-AT23.name=Silvester
-holiday.de-AT23.date=20121231
+holiday.de-AT23.date=20131231
 holiday.de-AT24.name=Neujahr
 holiday.de-AT24.date=20130101
 holiday.de-AT25.name=Heilige drei KÃ¶nige
 holiday.de-AT25.date=20130106
 holiday.de-AT26.name=Josef (K, St, T, V)
 holiday.de-AT26.date=20130319
 holiday.de-AT27.name=Karfreitag
 holiday.de-AT27.date=20130329
 holiday.de-AT28.name=Ostersonntag
 holiday.de-AT28.date=20130331
 holiday.de-AT29.name=Ostermontag
 holiday.de-AT29.date=20130401
 holiday.de-AT30.name=Staatsfeiertag
 holiday.de-AT30.date=20130501
 holiday.de-AT31.name=Florian (O)
 holiday.de-AT31.date=20130504
 holiday.de-AT32.name=Christi Himmelfahrt
 holiday.de-AT32.date=20130509
 holiday.de-AT33.name=Pfingstsonntag
 holiday.de-AT33.date=20130519
 holiday.de-AT34.name=Pfingstmontag
 holiday.de-AT34.date=20130520
 holiday.de-AT35.name=Fronleichnam
 holiday.de-AT35.date=20130530
 holiday.de-AT36.name=Mariä Himmelfahrt
 holiday.de-AT36.date=20130815
 holiday.de-AT37.name=Rupert (S)
 holiday.de-AT37.date=20130924
 holiday.de-AT38.name=Tag der Volksabstimmung (K)
 holiday.de-AT38.date=20131010
 holiday.de-AT39.name=Allerheiligen
 holiday.de-AT39.date=20131101
 holiday.de-AT40.name=Martin (B)
 holiday.de-AT40.date=20131111
 holiday.de-AT41.name=Leopold (W, N)
 holiday.de-AT41.date=20131115
 holiday.de-AT42.name=Mariä Empfängnis
 holiday.de-AT42.date=20131208
 holiday.de-AT43.name=Heiliger Abend
 holiday.de-AT43.date=20131224
 holiday.de-AT44.name=Christtag
 holiday.de-AT44.date=20131225
 holiday.de-AT45.name=Stefanitag
 holiday.de-AT45.date=20131226
 holiday.de-AT46.name=Silvester
 holiday.de-AT46.date=20131231
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,78 @@
 ###############################################################################
 holiday.de-DE1.name=Neujahr
-holiday.de-DE1.date=20120101
+holiday.de-DE1.date=20130101
 holiday.de-DE2.name=Heilige drei Könige
-holiday.de-DE2.date=20120106
+holiday.de-DE2.date=20130106
-holiday.de-DE3.name=Heilige drei Könige
+holiday.de-DE3.name=Karfreitag
-holiday.de-DE3.date=20120106
+holiday.de-DE3.date=20130329
-holiday.de-DE4.name=Heilige drei Könige
+holiday.de-DE4.name=Ostern
-holiday.de-DE4.date=20120106
+holiday.de-DE4.date=20130331
-holiday.de-DE5.name=Karfreitag
+holiday.de-DE5.name=Ostermontag
-holiday.de-DE5.date=20120406
+holiday.de-DE5.date=20130401
-holiday.de-DE6.name=Ostern
+holiday.de-DE6.name=Erster Maifeiertag
-holiday.de-DE6.date=20120408
+holiday.de-DE6.date=20130501
-holiday.de-DE7.name=Ostermontag
+holiday.de-DE7.name=Christi Himmelfahrt
-holiday.de-DE7.date=20120409
+holiday.de-DE7.date=20130509
-holiday.de-DE8.name=Erster Maifeiertag
+holiday.de-DE8.name=Pfingstsonntag
-holiday.de-DE8.date=20120501
+holiday.de-DE8.date=20130519
-holiday.de-DE9.name=Christi Himmelfahrt
+holiday.de-DE9.name=Pfingstmontag
-holiday.de-DE9.date=20120517
+holiday.de-DE9.date=20130520
-holiday.de-DE10.name=Pfingstsonntag
+holiday.de-DE10.name=Fronleichnam
-holiday.de-DE10.date=20120527
+holiday.de-DE10.date=20130530
-holiday.de-DE11.name=Pfingstmontag
+holiday.de-DE11.name=Mariä Himmelfahrt
-holiday.de-DE11.date=20120528
+holiday.de-DE11.date=20130815
-holiday.de-DE12.name=Fronleichnam
+holiday.de-DE12.name=Tag der Deutschen Einheit
-holiday.de-DE12.date=20120607
+holiday.de-DE12.date=20131003
-holiday.de-DE13.name=Fronleichnam
+holiday.de-DE13.name=Reformationstag
-holiday.de-DE13.date=20120607
+holiday.de-DE13.date=20131031
-holiday.de-DE14.name=Fronleichnam
+holiday.de-DE14.name=Allerheiligen
-holiday.de-DE14.date=20120607
+holiday.de-DE14.date=20131101
-holiday.de-DE15.name=Fronleichnam
+holiday.de-DE15.name=Buss und Bettag
-holiday.de-DE15.date=20120607
+holiday.de-DE15.date=20131120
-holiday.de-DE16.name=Fronleichnam
+holiday.de-DE16.name=Heilig Abend
-holiday.de-DE16.date=20120607
+holiday.de-DE16.date=20131224
-holiday.de-DE17.name=Fronleichnam
+holiday.de-DE17.name=Weihnachtstag
-holiday.de-DE17.date=20120607
+holiday.de-DE17.date=20131225
-holiday.de-DE18.name=Mariä Himmelfahrt
+holiday.de-DE18.name=Zweiter Weihnachtstag
-holiday.de-DE18.date=20120815
+holiday.de-DE18.date=20131226
-holiday.de-DE19.name=Tag der Deutschen Einheit
+holiday.de-DE19.name=Sylvester
-holiday.de-DE19.date=20121003
+holiday.de-DE19.date=20131231
-holiday.de-DE20.name=Reformationstag
+holiday.de-DE20.name=Neujahr
-holiday.de-DE20.date=20121031
+holiday.de-DE20.date=20140101
-holiday.de-DE21.name=Reformationstag
+holiday.de-DE21.name=Heilige drei Könige
-holiday.de-DE21.date=20121031
+holiday.de-DE21.date=20140106
-holiday.de-DE22.name=Reformationstag
+holiday.de-DE22.name=Karfreitag
-holiday.de-DE22.date=20121031
+holiday.de-DE22.date=20140418
-holiday.de-DE23.name=Reformationstag
+holiday.de-DE23.name=Ostern
-holiday.de-DE23.date=20121031
+holiday.de-DE23.date=20140420
-holiday.de-DE24.name=Reformationstag
+holiday.de-DE24.name=Ostermontag
-holiday.de-DE24.date=20121031
+holiday.de-DE24.date=20140421
-holiday.de-DE25.name=Allerheiligen
+holiday.de-DE25.name=Erster Maifeiertag
-holiday.de-DE25.date=20121101
+holiday.de-DE25.date=20140501
-holiday.de-DE26.name=Allerheiligen
+holiday.de-DE26.name=Christi Himmelfahrt
-holiday.de-DE26.date=20121101
+holiday.de-DE26.date=20140529
-holiday.de-DE27.name=Allerheiligen
+holiday.de-DE27.name=Pfingstsonntag
-holiday.de-DE27.date=20121101
+holiday.de-DE27.date=20140608
-holiday.de-DE28.name=Allerheiligen
+holiday.de-DE28.name=Pfingstmontag
-holiday.de-DE28.date=20121101
+holiday.de-DE28.date=20140609
-holiday.de-DE29.name=Allerheiligen
+holiday.de-DE29.name=Fronleichnam
-holiday.de-DE29.date=20121101
+holiday.de-DE29.date=20140619
-holiday.de-DE30.name=Buss und Bettag
+holiday.de-DE30.name=Mariä Himmelfahrt
-holiday.de-DE30.date=20121121
+holiday.de-DE30.date=20140815
-holiday.de-DE31.name=Heilig Abend
+holiday.de-DE31.name=Tag der Deutschen Einheit
-holiday.de-DE31.date=20121224
+holiday.de-DE31.date=20141003
-holiday.de-DE32.name=Weihnachtstag
+holiday.de-DE32.name=Reformationstag
-holiday.de-DE32.date=20121225
+holiday.de-DE32.date=20141031
-holiday.de-DE33.name=Zweiter Weihnachtstag
+holiday.de-DE33.name=Allerheiligen
-holiday.de-DE33.date=20121226
+holiday.de-DE33.date=20141101
-holiday.de-DE34.name=Sylvester
+holiday.de-DE34.name=Buss und Bettag
-holiday.de-DE34.date=20121231
+holiday.de-DE34.date=20141119
-holiday.de-DE35.name=Neujahr
+holiday.de-DE35.name=Heilig Abend
-holiday.de-DE35.date=20130101
+holiday.de-DE35.date=20141224
-holiday.de-DE36.name=Heilige drei Könige
+holiday.de-DE36.name=Weihnachtstag
-holiday.de-DE36.date=20130106
+holiday.de-DE36.date=20141225
-holiday.de-DE37.name=Heilige drei Könige
+holiday.de-DE37.name=Zweiter Weihnachtstag
-holiday.de-DE37.date=20130106
+holiday.de-DE37.date=20141226
-holiday.de-DE38.name=Heilige drei Könige
+holiday.de-DE38.name=Sylvester
-holiday.de-DE38.date=20130106
+holiday.de-DE38.date=20141231
 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-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
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,28 @@
 ###############################################################################
 holiday.en-CA1.name=New Year's Day
-holiday.en-CA1.date=20120101
+holiday.en-CA1.date=20130101
-holiday.en-CA2.name=New Year's Day (obs.)
+holiday.en-CA2.name=Family Day
-holiday.en-CA2.date=20120102
+holiday.en-CA2.date=20130218
-holiday.en-CA3.name=Family Day
+holiday.en-CA3.name=Good Friday
-holiday.en-CA3.date=20120220
+holiday.en-CA3.date=20130329
-holiday.en-CA4.name=Good Friday
+holiday.en-CA4.name=Easter Monday
-holiday.en-CA4.date=20120406
+holiday.en-CA4.date=20130401
-holiday.en-CA5.name=Easter Monday
+holiday.en-CA5.name=Victoria Day
-holiday.en-CA5.date=20120409
+holiday.en-CA5.date=20130520
-holiday.en-CA6.name=Victoria Day
+holiday.en-CA6.name=Canada Day
-holiday.en-CA6.date=20120521
+holiday.en-CA6.date=20130701
-holiday.en-CA7.name=Canada Day
+holiday.en-CA7.name=First Monday of August
-holiday.en-CA7.date=20120701
+holiday.en-CA7.date=20130805
-holiday.en-CA8.name=Canada Day (obs.)
+holiday.en-CA8.name=Labour Day
-holiday.en-CA8.date=20120702
+holiday.en-CA8.date=20130902
-holiday.en-CA9.name=First Monday of August
+holiday.en-CA9.name=Thanksgiving Day
-holiday.en-CA9.date=20120806
+holiday.en-CA9.date=20131014
-holiday.en-CA10.name=Labour Day
+holiday.en-CA10.name=Remembrance Day
-holiday.en-CA10.date=20120903
+holiday.en-CA10.date=20131111
-holiday.en-CA11.name=Thanksgiving Day
+holiday.en-CA11.name=Christmas Day
-holiday.en-CA11.date=20121008
+holiday.en-CA11.date=20131225
-holiday.en-CA12.name=Remembrance Day
+holiday.en-CA12.name=Boxing Day
-holiday.en-CA12.date=20121111
+holiday.en-CA12.date=20131226
-holiday.en-CA13.name=Christmas Day
+holiday.en-CA13.name=New Year's Eve
-holiday.en-CA13.date=20121225
+holiday.en-CA13.date=20131231
 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
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,34 @@
 ###############################################################################
 holiday.en-GB1.name=New Year's Day
-holiday.en-GB1.date=20120101
+holiday.en-GB1.date=20130101
-holiday.en-GB2.name=New Year's Day Holiday
+holiday.en-GB2.name=Good Friday
-holiday.en-GB2.date=20120102
+holiday.en-GB2.date=20130329
-holiday.en-GB3.name=Good Friday
+holiday.en-GB3.name=Easter Monday
-holiday.en-GB3.date=20120406
+holiday.en-GB3.date=20130401
-holiday.en-GB4.name=Easter Monday
+holiday.en-GB4.name=Early May Bank Holiday
-holiday.en-GB4.date=20120409
+holiday.en-GB4.date=20130506
-holiday.en-GB5.name=Early May Bank Holiday
+holiday.en-GB5.name=Spring Bank Holiday
-holiday.en-GB5.date=20120507
+holiday.en-GB5.date=20130527
-holiday.en-GB6.name=Spring Bank Holiday
+holiday.en-GB6.name=August Bank Holiday
-holiday.en-GB6.date=20120604
+holiday.en-GB6.date=20130826
-holiday.en-GB7.name=Queen's Diamond Jubilee
+holiday.en-GB7.name=Christmas Day
-holiday.en-GB7.date=20120605
+holiday.en-GB7.date=20131225
-holiday.en-GB8.name=August Bank Holiday
+holiday.en-GB8.name=Boxing Day
-holiday.en-GB8.date=20120827
+holiday.en-GB8.date=20131226
-holiday.en-GB9.name=Christmas Day
+holiday.en-GB9.name=New Year's Day
-holiday.en-GB9.date=20121225
+holiday.en-GB9.date=20140101
-holiday.en-GB10.name=Boxing Day
+holiday.en-GB10.name=Good Friday
-holiday.en-GB10.date=20121226
+holiday.en-GB10.date=20140418
-holiday.en-GB11.name=New Year's Day
+holiday.en-GB11.name=Easter Monday
-holiday.en-GB11.date=20130101
+holiday.en-GB11.date=20140421
-holiday.en-GB12.name=Good Friday
+holiday.en-GB12.name=Early May Bank Holiday
-holiday.en-GB12.date=20130329
+holiday.en-GB12.date=20140505
-holiday.en-GB13.name=Easter Monday
+holiday.en-GB13.name=Spring Bank Holiday
-holiday.en-GB13.date=20130401
+holiday.en-GB13.date=20140526
-holiday.en-GB14.name=Early May Bank Holiday
+holiday.en-GB14.name=August Bank Holiday
-holiday.en-GB14.date=20130506
+holiday.en-GB14.date=20140825
-holiday.en-GB15.name=Spring Bank Holiday
+holiday.en-GB15.name=Christmas Day
-holiday.en-GB15.date=20130527
+holiday.en-GB15.date=20141225
-holiday.en-GB16.name=August Bank Holiday
+holiday.en-GB16.name=Boxing Day
-holiday.en-GB16.date=20130826
+holiday.en-GB16.date=20141226
 holiday.en-GB17.name=Christmas Day
 holiday.en-GB17.date=20131225
 holiday.en-GB18.name=Boxing Day
 holiday.en-GB18.date=20131226
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,22 @@
 ###############################################################################
 holiday.en-NZ1.name=New Year's Day
-holiday.en-NZ1.date=20120101
+holiday.en-NZ1.date=20130101
 holiday.en-NZ2.name=Day after New Years Day
-holiday.en-NZ2.date=20120102
+holiday.en-NZ2.date=20130102
 holiday.en-NZ3.name=Waitangi Day
-holiday.en-NZ3.date=20120206
+holiday.en-NZ3.date=20130206
 holiday.en-NZ4.name=Good Friday
-holiday.en-NZ4.date=20120406
+holiday.en-NZ4.date=20130329
 holiday.en-NZ5.name=Easter Monday
-holiday.en-NZ5.date=20120409
+holiday.en-NZ5.date=20130401
 holiday.en-NZ6.name=ANZAC Day
-holiday.en-NZ6.date=20120425
+holiday.en-NZ6.date=20130425
 holiday.en-NZ7.name=Queen's Birthday
-holiday.en-NZ7.date=20120604
+holiday.en-NZ7.date=20130603
 holiday.en-NZ8.name=Labour Day
-holiday.en-NZ8.date=20121022
+holiday.en-NZ8.date=20131028
 holiday.en-NZ9.name=Christmas Day
-holiday.en-NZ9.date=20121225
+holiday.en-NZ9.date=20131225
 holiday.en-NZ10.name=Boxing Day
-holiday.en-NZ10.date=20121226
+holiday.en-NZ10.date=20131226
 holiday.en-NZ11.name=New Year's Day
 holiday.en-NZ11.date=20130101
 holiday.en-NZ12.name=Day after New Years Day
 holiday.en-NZ12.date=20130102
 holiday.en-NZ13.name=Waitangi Day
 holiday.en-NZ13.date=20130206
 holiday.en-NZ14.name=Good Friday
 holiday.en-NZ14.date=20130329
 holiday.en-NZ15.name=Easter Monday
 holiday.en-NZ15.date=20130401
 holiday.en-NZ16.name=ANZAC Day
 holiday.en-NZ16.date=20130425
 holiday.en-NZ17.name=Queen's Birthday
 holiday.en-NZ17.date=20130603
 holiday.en-NZ18.name=Labour Day
 holiday.en-NZ18.date=20131028
 holiday.en-NZ19.name=Christmas Day
 holiday.en-NZ19.date=20131225
 holiday.en-NZ20.name=Boxing Day
 holiday.en-NZ20.date=20131226
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,48 +28,46 @@
 ###############################################################################
 holiday.en-US1.name=New Year's Day
-holiday.en-US1.date=20120101
+holiday.en-US1.date=20130101
-holiday.en-US2.name=New Year's Day
+holiday.en-US2.name=Birthday of Martin Luther King, Jr.
-holiday.en-US2.date=20120102
+holiday.en-US2.date=20130121
-holiday.en-US3.name=Birthday of Martin Luther King, Jr.
+holiday.en-US3.name=Washington's Birthday
-holiday.en-US3.date=20120116
+holiday.en-US3.date=20130218
-holiday.en-US4.name=Washington's Birthday
+holiday.en-US4.name=Patriots' Day
-holiday.en-US4.date=20120220
+holiday.en-US4.date=20130415
-holiday.en-US5.name=Patriots' Day
+holiday.en-US5.name=Memorial Day
-holiday.en-US5.date=20120416
+holiday.en-US5.date=20130527
-holiday.en-US7.name=Memorial Day
+holiday.en-US6.name=Independence Day
-holiday.en-US7.date=20120528
+holiday.en-US6.date=20130704
-holiday.en-US8.name=Independence Day
+holiday.en-US7.name=Labor Day
-holiday.en-US8.date=20120704
+holiday.en-US7.date=20130902
-holiday.en-US9.name=Labor Day
+holiday.en-US8.name=Columbus Day
-holiday.en-US9.date=20120903
+holiday.en-US8.date=20131014
-holiday.en-US10.name=Columbus Day
+holiday.en-US9.name=Veterans Day
-holiday.en-US10.date=20121008
+holiday.en-US9.date=20131111
-holiday.en-US11.name=Veterans Day
+holiday.en-US10.name=Thanksgiving Day
-holiday.en-US11.date=20121112
+holiday.en-US10.date=20131128
-holiday.en-US12.name=Thanksgiving Day
+holiday.en-US11.name=Christmas Day
-holiday.en-US12.date=20121122
+holiday.en-US11.date=20131225
-holiday.en-US13.name=Christmas Day
+holiday.en-US12.name=New Year's Day
-holiday.en-US13.date=20121225
+holiday.en-US12.date=20140101
-holiday.en-US14.name=New Year's Day
+holiday.en-US13.name=Birthday of Martin Luther King, Jr.
-holiday.en-US14.date=20130101
+holiday.en-US13.date=20140120
-holiday.en-US15.name=Birthday of Martin Luther King, Jr.
+holiday.en-US14.name=Washington's Birthday
-holiday.en-US15.date=20130121
+holiday.en-US14.date=20140217
-holiday.en-US16.name=Washington's Birthday
+holiday.en-US15.name=Patriots' Day
-holiday.en-US16.date=20130218
+holiday.en-US15.date=20140421
-holiday.en-US18.name=Patriots' Day
+holiday.en-US16.name=Memorial Day
-holiday.en-US18.date=20130415
+holiday.en-US16.date=20140526
-holiday.en-US19.name=Memorial Day
+holiday.en-US17.name=Independence Day
-holiday.en-US19.date=20130527
+holiday.en-US17.date=20140704
-holiday.en-US20.name=Independence Day
+holiday.en-US18.name=Labor Day
-holiday.en-US20.date=20130704
+holiday.en-US18.date=20140901
-holiday.en-US21.name=Labor Day
+holiday.en-US19.name=Columbus Day
-holiday.en-US21.date=20130902
+holiday.en-US19.date=20141013
-holiday.en-US22.name=Columbus Day
+holiday.en-US20.name=Veterans Day
-holiday.en-US22.date=20131014
+holiday.en-US20.date=20141111
-holiday.en-US23.name=Veterans Day
+holiday.en-US21.name=Thanksgiving Day
-holiday.en-US23.date=20131111
+holiday.en-US21.date=20141127
-holiday.en-US24.name=Thanksgiving Day
+holiday.en-US22.name=Christmas Day
-holiday.en-US24.date=20131128
+holiday.en-US22.date=20141225
 holiday.en-US25.name=Christmas Day
 holiday.en-US25.date=20131225
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,54 @@
 ###############################################################################
 holiday.es-ES1.name=Año Nuevo
-holiday.es-ES1.date=20120101
+holiday.es-ES1.date=20130101
 holiday.es-ES2.name=Día de los Reyes
-holiday.es-ES2.date=20120106
+holiday.es-ES2.date=20130106
 holiday.es-ES3.name=Viernes Santo
-holiday.es-ES3.date=20120406
+holiday.es-ES3.date=20130329
-holiday.es-ES4.name=Fiesta del Trabajo
+holiday.es-ES4.name=Pascua
-holiday.es-ES4.date=20120501
+holiday.es-ES4.date=20130331
-holiday.es-ES5.name=Asunción de la Virgen
+holiday.es-ES5.name=Fiesta del Trabajo
-holiday.es-ES5.date=20120815
+holiday.es-ES5.date=20130501
-holiday.es-ES6.name=Fiesta Nacional de España
+holiday.es-ES6.name=Asunción de la Virgen
-holiday.es-ES6.date=20121012
+holiday.es-ES6.date=20130815
-holiday.es-ES7.name=Dia de todos los Santos
+holiday.es-ES7.name=Fiesta Nacional de España
-holiday.es-ES7.date=20121101
+holiday.es-ES7.date=20131012
-holiday.es-ES8.name=Dia de la Constitución
+holiday.es-ES8.name=Dia de todos los Santos
-holiday.es-ES8.date=20121206
+holiday.es-ES8.date=20131101
-holiday.es-ES9.name=Inmaculada Concepción
+holiday.es-ES9.name=Dia de la Constitución
-holiday.es-ES9.date=20121208
+holiday.es-ES9.date=20131206
-holiday.es-ES10.name=Noche Buena
+holiday.es-ES10.name=Inmaculada Concepción
-holiday.es-ES10.date=20121224
+holiday.es-ES10.date=20131208
-holiday.es-ES11.name=Navidad
+holiday.es-ES11.name=Noche Buena
-holiday.es-ES11.date=20121225
+holiday.es-ES11.date=20131224
-holiday.es-ES12.name=Noche Vieja
+holiday.es-ES12.name=Navidad
-holiday.es-ES12.date=20121231
+holiday.es-ES12.date=20131225
-holiday.es-ES13.name=Año Nuevo
+holiday.es-ES13.name=Noche Vieja
-holiday.es-ES13.date=20130101
+holiday.es-ES13.date=20131231
-holiday.es-ES14.name=Día de los Reyes
+holiday.es-ES14.name=Año Nuevo
-holiday.es-ES14.date=20130106
+holiday.es-ES14.date=20140101
-holiday.es-ES15.name=Viernes Santo
+holiday.es-ES15.name=Día de los Reyes
-holiday.es-ES15.date=20130329
+holiday.es-ES15.date=20140106
-holiday.es-ES16.name=Pascua
+holiday.es-ES16.name=Viernes Santo
-holiday.es-ES16.date=20130331
+holiday.es-ES16.date=20140418
-holiday.es-ES17.name=Fiesta del Trabajo
+holiday.es-ES17.name=Pascua
-holiday.es-ES17.date=20130501
+holiday.es-ES17.date=20140420
-holiday.es-ES18.name=Asunción de la Virgen
+holiday.es-ES18.name=Fiesta del Trabajo
-holiday.es-ES18.date=20130815
+holiday.es-ES18.date=20140501
-holiday.es-ES19.name=Fiesta Nacional de España
+holiday.es-ES19.name=Asunción de la Virgen
-holiday.es-ES19.date=20131012
+holiday.es-ES19.date=20140815
-holiday.es-ES20.name=Dia de todos los Santos
+holiday.es-ES20.name=Fiesta Nacional de España
-holiday.es-ES20.date=20131101
+holiday.es-ES20.date=20141012
-holiday.es-ES21.name=Dia de la Constitución
+holiday.es-ES21.name=Dia de todos los Santos
-holiday.es-ES21.date=20131206
+holiday.es-ES21.date=20141101
-holiday.es-ES22.name=Inmaculada Concepción
+holiday.es-ES22.name=Dia de la Constitución
-holiday.es-ES22.date=20131208
+holiday.es-ES22.date=20141206
-holiday.es-ES23.name=Noche Buena
+holiday.es-ES23.name=Inmaculada Concepción
-holiday.es-ES23.date=20131224
+holiday.es-ES23.date=20141208
-holiday.es-ES24.name=Navidad
+holiday.es-ES24.name=Noche Buena
-holiday.es-ES24.date=20131225
+holiday.es-ES24.date=20141224
-holiday.es-ES25.name=Noche Vieja
+holiday.es-ES25.name=Navidad
-holiday.es-ES25.date=20131231
+holiday.es-ES25.date=20141225
 holiday.es-ES26.name=Noche Vieja
 holiday.es-ES26.date=20141231
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,24 @@
 ###############################################################################
 holiday.fr-FR1.name=Jour de l'an
-holiday.fr-FR1.date=20120101
+holiday.fr-FR1.date=20130101
 holiday.fr-FR2.name=Lundi de Pâques
-holiday.fr-FR2.date=20120409
+holiday.fr-FR2.date=20130401
 holiday.fr-FR3.name=Fête du premier mai
-holiday.fr-FR3.date=20120501
+holiday.fr-FR3.date=20130501
 holiday.fr-FR4.name=Armistice 1945
-holiday.fr-FR4.date=20120508
+holiday.fr-FR4.date=20130508
 holiday.fr-FR5.name=Ascencion
-holiday.fr-FR5.date=20120517
+holiday.fr-FR5.date=20130509
 holiday.fr-FR6.name=Pentecôte
-holiday.fr-FR6.date=20120528
+holiday.fr-FR6.date=20130519
 holiday.fr-FR7.name=Fête nationale
-holiday.fr-FR7.date=20120714
+holiday.fr-FR7.date=20130714
 holiday.fr-FR8.name=Assomption
-holiday.fr-FR8.date=20120815
+holiday.fr-FR8.date=20130815
 holiday.fr-FR9.name=Toussaint
-holiday.fr-FR9.date=20121101
+holiday.fr-FR9.date=20131101
 holiday.fr-FR10.name=Armistice 1918
-holiday.fr-FR10.date=20121111
+holiday.fr-FR10.date=20131111
 holiday.fr-FR11.name=Noël
-holiday.fr-FR11.date=20121225
+holiday.fr-FR11.date=20131225
 holiday.fr-FR12.name=Jour de l'an
 holiday.fr-FR12.date=20130101
 holiday.fr-FR13.name=Lundi de Pâques
 holiday.fr-FR13.date=20130401
 holiday.fr-FR14.name=Fête du premier mai
 holiday.fr-FR14.date=20130501
 holiday.fr-FR15.name=Armistice 1945
 holiday.fr-FR15.date=20130508
 holiday.fr-FR16.name=Ascencion
 holiday.fr-FR16.date=20130509
 holiday.fr-FR17.name=Pentecôte
 holiday.fr-FR17.date=20130519
 holiday.fr-FR18.name=Fête nationale
 holiday.fr-FR18.date=20130714
 holiday.fr-FR19.name=Assomption
 holiday.fr-FR19.date=20130815
 holiday.fr-FR20.name=Toussaint
 holiday.fr-FR20.date=20131101
 holiday.fr-FR21.name=Armistice 1918
 holiday.fr-FR21.date=20131111
 holiday.fr-FR22.name=Noël
 holiday.fr-FR22.date=20131225
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,26 @@
 ###############################################################################
 holiday.it-IT1.name=Capodanno
-holiday.it-IT1.date=20120101
+holiday.it-IT1.date=20130101
 holiday.it-IT2.name=Epifania
-holiday.it-IT2.date=20120106
+holiday.it-IT2.date=20130106
 holiday.it-IT3.name=Carnevale
-holiday.it-IT3.date=20120308
+holiday.it-IT3.date=20130210
 holiday.it-IT4.name=Pasqua
-holiday.it-IT4.date=20120409
+holiday.it-IT4.date=20130401
 holiday.it-IT5.name=Festa della liberazione
-holiday.it-IT5.date=20120425
+holiday.it-IT5.date=20130425
 holiday.it-IT6.name=Festa del lavoro
-holiday.it-IT6.date=20120501
+holiday.it-IT6.date=20130501
 holiday.it-IT7.name=Festa della repubblica
-holiday.it-IT7.date=20120602
+holiday.it-IT7.date=20130602
 holiday.it-IT8.name=Assunzione (ferragosto)
-holiday.it-IT8.date=20120815
+holiday.it-IT8.date=20130815
 holiday.it-IT9.name=Ognissanti
-holiday.it-IT9.date=20121101
+holiday.it-IT9.date=20131101
 holiday.it-IT10.name=Immacolata concezione
-holiday.it-IT10.date=20121208
+holiday.it-IT10.date=20131208
 holiday.it-IT11.name=Natale
-holiday.it-IT11.date=20121225
+holiday.it-IT11.date=20131225
 holiday.it-IT12.name=S.to Stefano
-holiday.it-IT12.date=20121226
+holiday.it-IT12.date=20131226
 holiday.it-IT13.name=Capodanno
 holiday.it-IT13.date=20130101
 holiday.it-IT14.name=Epifania
 holiday.it-IT14.date=20130106
 holiday.it-IT15.name=Carnevale
 holiday.it-IT15.date=20130210
 holiday.it-IT16.name=Pasqua
 holiday.it-IT16.date=20130401
 holiday.it-IT17.name=Festa della liberazione
 holiday.it-IT17.date=20130425
 holiday.it-IT18.name=Festa del lavoro
 holiday.it-IT18.date=20130501
 holiday.it-IT19.name=Festa della repubblica
 holiday.it-IT19.date=20130602
 holiday.it-IT20.name=Assunzione (ferragosto)
 holiday.it-IT20.date=20130815
 holiday.it-IT21.name=Ognissanti
 holiday.it-IT21.date=20131101
 holiday.it-IT22.name=Immacolata concezione
 holiday.it-IT22.date=20131208
 holiday.it-IT23.name=Natale
 holiday.it-IT23.date=20131225
 holiday.it-IT24.name=S.to Stefano
 holiday.it-IT24.date=20131226
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,36 @@
 ###############################################################################
 holiday.jp-JP1.name=元日
-holiday.jp-JP1.date=20120101
+holiday.jp-JP1.date=20130101
-holiday.jp-JP2.name=振替休日
+holiday.jp-JP2.name=成人の日
-holiday.jp-JP2.date=20120102
+holiday.jp-JP2.date=20130114
-holiday.jp-JP3.name=成人の日
+holiday.jp-JP3.name=建国記念の日
-holiday.jp-JP3.date=20120109
+holiday.jp-JP3.date=20130211
-holiday.jp-JP4.name=建国記念の日
+holiday.jp-JP4.name=春分の日
-holiday.jp-JP4.date=20120211
+holiday.jp-JP4.date=20130320
-holiday.jp-JP5.name=春分の日
+holiday.jp-JP5.name=昭和の日
-holiday.jp-JP5.date=20120320
+holiday.jp-JP5.date=20130429
-holiday.jp-JP6.name=昭和の日
+holiday.jp-JP6.name=憲法記念日
-holiday.jp-JP6.date=20120429
+holiday.jp-JP6.date=20130503
-holiday.jp-JP7.name=振替休日
+holiday.jp-JP7.name=みどりの日
-holiday.jp-JP7.date=20120430
+holiday.jp-JP7.date=20130504
-holiday.jp-JP8.name=憲法記念日
+holiday.jp-JP8.name=こどもの日
-holiday.jp-JP8.date=20120503
+holiday.jp-JP8.date=20130505
-holiday.jp-JP9.name=みどりの日
+holiday.jp-JP9.name=振替休日
-holiday.jp-JP9.date=20120504
+holiday.jp-JP9.date=20130506
-holiday.jp-JP10.name=こどもの日
+holiday.jp-JP10.name=海の日
-holiday.jp-JP10.date=20120505
+holiday.jp-JP10.date=20130715
-holiday.jp-JP11.name=海の日
+holiday.jp-JP11.name=敬老の日
-holiday.jp-JP11.date=20120716
+holiday.jp-JP11.date=20130919
-holiday.jp-JP12.name=敬老の日
+holiday.jp-JP12.name=秋分の日
-holiday.jp-JP12.date=20120917
+holiday.jp-JP12.date=20130923
-holiday.jp-JP13.name=秋分の日
+holiday.jp-JP13.name=体育の日
-holiday.jp-JP13.date=20120922
+holiday.jp-JP13.date=20131014
-holiday.jp-JP14.name=体育の日
+holiday.jp-JP14.name=文化の日
-holiday.jp-JP14.date=20121008
+holiday.jp-JP14.date=20131103
-holiday.jp-JP15.name=文化の日
+holiday.jp-JP15.name=振替休日
-holiday.jp-JP15.date=20121103
+holiday.jp-JP15.date=20131104
 holiday.jp-JP16.name=勤労感謝の日
-holiday.jp-JP16.date=20121123
+holiday.jp-JP16.date=20131123
 holiday.jp-JP17.name=天皇誕生日
-holiday.jp-JP17.date=20121223
+holiday.jp-JP17.date=20131223
 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
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,36 @@
 ###############################################################################
 holiday.nb-NO1.name=Nyttårsdag
-holiday.nb-NO1.date=20120101
+holiday.nb-NO1.date=20130101
 holiday.nb-NO2.name=Fastelavn
-holiday.nb-NO2.date=20120219
+holiday.nb-NO2.date=20130210
 holiday.nb-NO3.name=Palmesøndag
-holiday.nb-NO3.date=20120401
+holiday.nb-NO3.date=20130324
 holiday.nb-NO4.name=Skjærtorsdag
-holiday.nb-NO4.date=20120405
+holiday.nb-NO4.date=20130328
 holiday.nb-NO5.name=Langfredag
-holiday.nb-NO5.date=20120406
+holiday.nb-NO5.date=20130329
 holiday.nb-NO6.name=Påskedag
-holiday.nb-NO6.date=20120408
+holiday.nb-NO6.date=20130331
 holiday.nb-NO7.name=Påskedag
-holiday.nb-NO7.date=20120409
+holiday.nb-NO7.date=20130401
 holiday.nb-NO8.name=Offentlig Høytidsdag
-holiday.nb-NO8.date=20120501
+holiday.nb-NO8.date=20130501
 holiday.nb-NO9.name=Frigjøringsdag 1945
-holiday.nb-NO9.date=20120508
+holiday.nb-NO9.date=20130508
 holiday.nb-NO10.name=Grunnlovsdag
-holiday.nb-NO10.date=20120517
+holiday.nb-NO10.date=20130517
 holiday.nb-NO11.name=Kristi Himmelfartsdag
-holiday.nb-NO11.date=20120517
+holiday.nb-NO11.date=20130509
 holiday.nb-NO12.name=Pinsedag
-holiday.nb-NO12.date=20120527
+holiday.nb-NO12.date=20130519
 holiday.nb-NO13.name=Pinsedag
-holiday.nb-NO13.date=20120528
+holiday.nb-NO13.date=20130520
 holiday.nb-NO14.name=Julaften
-holiday.nb-NO14.date=20121224
+holiday.nb-NO14.date=20131224
 holiday.nb-NO15.name=Juledag
-holiday.nb-NO15.date=20121225
+holiday.nb-NO15.date=20131225
 holiday.nb-NO16.name=Juledag
-holiday.nb-NO16.date=20121226
+holiday.nb-NO16.date=20131226
 holiday.nb-NO17.name=Nyttårsaften
-holiday.nb-NO17.date=20121231
+holiday.nb-NO17.date=20131231
 holiday.nb-NO18.name=Nyttårsdag
 holiday.nb-NO18.date=20130101
 holiday.nb-NO19.name=Fastelavn
 holiday.nb-NO19.date=20130210
 holiday.nb-NO20.name=Palmesøndag
 holiday.nb-NO20.date=20130324
 holiday.nb-NO21.name=Skjærtorsdag
 holiday.nb-NO21.date=20130328
 holiday.nb-NO22.name=Langfredag
 holiday.nb-NO22.date=20130329
 holiday.nb-NO23.name=Påskedag
 holiday.nb-NO23.date=20130331
 holiday.nb-NO24.name=Påskedag
 holiday.nb-NO24.date=20130401
 holiday.nb-NO25.name=Offentlig Høytidsdag
 holiday.nb-NO25.date=20130501
 holiday.nb-NO26.name=Frigjøringsdag 1945
 holiday.nb-NO26.date=20130508
 holiday.nb-NO27.name=Grunnlovsdag
 holiday.nb-NO27.date=20130517
 holiday.nb-NO28.name=Kristi Himmelfartsdag
 holiday.nb-NO28.date=20130509
 holiday.nb-NO29.name=Pinsedag
 holiday.nb-NO29.date=20130519
 holiday.nb-NO30.name=Pinsedag
 holiday.nb-NO30.date=20130520
 holiday.nb-NO31.name=Julaften
 holiday.nb-NO31.date=20131224
 holiday.nb-NO32.name=Juledag
 holiday.nb-NO32.date=20131225
 holiday.nb-NO33.name=Juledag
 holiday.nb-NO33.date=20131226
 holiday.nb-NO34.name=Nyttårsaften
 holiday.nb-NO34.date=20131231
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,30 @@
 ###############################################################################
 holiday.nl-NL1.name=Nieuwjaar
-holiday.nl-NL1.date=20120101
+holiday.nl-NL1.date=20130101
 holiday.nl-NL2.name=Goede Vrijdag
-holiday.nl-NL2.date=20120406
+holiday.nl-NL2.date=20130329
 holiday.nl-NL3.name=Pasen
-holiday.nl-NL3.date=20120408
+holiday.nl-NL3.date=20130331
 holiday.nl-NL4.name=Tweede Pasdag
-holiday.nl-NL4.date=20120409
+holiday.nl-NL4.date=20130401
 holiday.nl-NL5.name=Koninginnedag
-holiday.nl-NL5.date=20120430
+holiday.nl-NL5.date=20130430
 holiday.nl-NL6.name=Dodenherdenking
-holiday.nl-NL6.date=20120504
+holiday.nl-NL6.date=20130504
 holiday.nl-NL7.name=Bevrijdingsdag
-holiday.nl-NL7.date=20120505
+holiday.nl-NL7.date=20130505
 holiday.nl-NL8.name=Hemelvaartsdag
-holiday.nl-NL8.date=20120517
+holiday.nl-NL8.date=20130509
 holiday.nl-NL9.name=Pinksteren
-holiday.nl-NL9.date=20120527
+holiday.nl-NL9.date=20130519
 holiday.nl-NL10.name=Tweede Pinksterdag
-holiday.nl-NL10.date=20120528
+holiday.nl-NL10.date=20130520
 holiday.nl-NL11.name=Sinterklaas
-holiday.nl-NL11.date=20121205
+holiday.nl-NL11.date=20131205
 holiday.nl-NL12.name=Koninkrijksdag
-holiday.nl-NL12.date=20121215
+holiday.nl-NL12.date=20131215
 holiday.nl-NL13.name=Kerstmis
-holiday.nl-NL13.date=20121225
+holiday.nl-NL13.date=20131225
 holiday.nl-NL14.name=Tweede Kerstdag
-holiday.nl-NL14.date=20121226
+holiday.nl-NL14.date=20131226
 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
--- 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
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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,70 @@
 ###############################################################################
 holiday.sv-SE1.name=Nyårsdagen
-holiday.sv-SE1.date=20120101
+holiday.sv-SE1.date=20130101
 holiday.sv-SE2.name=Trettondedag jul
-holiday.sv-SE2.date=20120106
+holiday.sv-SE2.date=20130106
 holiday.sv-SE3.name=Långfredagen
-holiday.sv-SE3.date=20120406
+holiday.sv-SE3.date=20130329
 holiday.sv-SE4.name=Påskdagen
-holiday.sv-SE4.date=20120408
+holiday.sv-SE4.date=20130331
 holiday.sv-SE5.name=Annandag påsk
-holiday.sv-SE5.date=20120409
+holiday.sv-SE5.date=20130401
 holiday.sv-SE6.name=Valborgmässoafton
-holiday.sv-SE6.date=20120430
+holiday.sv-SE6.date=20130430
 holiday.sv-SE7.name=Första maj
-holiday.sv-SE7.date=20120501
+holiday.sv-SE7.date=20130501
 holiday.sv-SE8.name=Kristi Himmelsfärdsdag
-holiday.sv-SE8.date=20120517
+holiday.sv-SE8.date=20130509
 holiday.sv-SE9.name=Pingstdagen
-holiday.sv-SE9.date=20120527
+holiday.sv-SE9.date=20130519
 holiday.sv-SE10.name=Nationaldagen
-holiday.sv-SE10.date=20120606
+holiday.sv-SE10.date=20130606
 holiday.sv-SE11.name=Midsommarafton
-holiday.sv-SE11.date=20120622
+holiday.sv-SE11.date=20130621
 holiday.sv-SE12.name=Midsommardagen
-holiday.sv-SE12.date=20120623
+holiday.sv-SE12.date=20130622
 holiday.sv-SE13.name=Alla Helgons Dag
-holiday.sv-SE13.date=20121103
+holiday.sv-SE13.date=20131102
 holiday.sv-SE14.name=Julafton
-holiday.sv-SE14.date=20121224
+holiday.sv-SE14.date=20131224
 holiday.sv-SE15.name=Juldagen
-holiday.sv-SE15.date=20121225
+holiday.sv-SE15.date=20131225
 holiday.sv-SE16.name=Annandag jul
-holiday.sv-SE16.date=20121226
+holiday.sv-SE16.date=20131226
 holiday.sv-SE17.name=Nyårsafton
-holiday.sv-SE17.date=20121231
+holiday.sv-SE17.date=20131231
 holiday.sv-SE18.name=Nyårsdagen
-holiday.sv-SE18.date=20130101
+holiday.sv-SE18.date=20140101
 holiday.sv-SE19.name=Trettondedag jul
-holiday.sv-SE19.date=20130106
+holiday.sv-SE19.date=20140106
 holiday.sv-SE20.name=Långfredagen
-holiday.sv-SE20.date=20130329
+holiday.sv-SE20.date=20140418
 holiday.sv-SE21.name=Påskdagen
-holiday.sv-SE21.date=20130331
+holiday.sv-SE21.date=20140420
 holiday.sv-SE22.name=Annandag påsk
-holiday.sv-SE22.date=20130401
+holiday.sv-SE22.date=20140421
 holiday.sv-SE23.name=Valborgmässoafton
-holiday.sv-SE23.date=20130430
+holiday.sv-SE23.date=20140430
 holiday.sv-SE24.name=Första maj
-holiday.sv-SE24.date=20130501
+holiday.sv-SE24.date=20140501
 holiday.sv-SE25.name=Kristi Himmelsfärdsdag
-holiday.sv-SE25.date=20130509
+holiday.sv-SE25.date=20140529
 holiday.sv-SE26.name=Pingstdagen
-holiday.sv-SE26.date=20130519
+holiday.sv-SE26.date=20140608
 holiday.sv-SE27.name=Nationaldagen
-holiday.sv-SE27.date=20130606
+holiday.sv-SE27.date=20140606
 holiday.sv-SE28.name=Midsommarafton
-holiday.sv-SE28.date=20130621
+holiday.sv-SE28.date=20140620
 holiday.sv-SE29.name=Midsommardagen
-holiday.sv-SE29.date=20130622
+holiday.sv-SE29.date=20140621
 holiday.sv-SE30.name=Alla Helgons Dag
-holiday.sv-SE30.date=20131102
+holiday.sv-SE30.date=20141031
 holiday.sv-SE31.name=Julafton
-holiday.sv-SE31.date=20131224
+holiday.sv-SE31.date=20141224
 holiday.sv-SE32.name=Juldagen
-holiday.sv-SE32.date=20131225
+holiday.sv-SE32.date=20141225
 holiday.sv-SE33.name=Annandag jul
-holiday.sv-SE33.date=20131226
+holiday.sv-SE33.date=20141226
 holiday.sv-SE34.name=Nyårsafton
-holiday.sv-SE34.date=20131231
+holiday.sv-SE34.date=20141231
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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/doc/rc/solarized-dark-256.theme
+++ b/doc/rc/solarized-dark-256.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
 # 
 # Colors used are based on the Solarized palette created by Ethan Schoonover 
 # <http://ethanschoonover.com/solarized>
--- a/doc/rc/solarized-light-256.theme
+++ b/doc/rc/solarized-light-256.theme
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
 # 
 # Colors used are based on the Solarized palette created by Ethan Schoonover 
 # <http://ethanschoonover.com/solarized>
--- 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/tips.en-US
+++ b/i18n/tips.en-US
@ -1,7 +1,7 @@
 %
 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
+Have you tried 'task 1 edit' 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
--- a/i18n/tips.es-ES
+++ b/i18n/tips.es-ES
@ -0,0 +1,72 @@
 %
 Para usuarios de bash, pruebe 'alias t=task' para ahorrarse algo de tecleo.
 %
 ¿Ha probado 'task 1 edit', que permite usar su editor para modificar cualquier
 aspecto de la tarea 1?
 %
 ¿Sabía que 'task 1 wait:eom' ocultará la tarea 1 hasta final de mes? Puede ver
 todas las tareas en espera con 'task waiting'.
 %
 ¿Sabía que 'task 1 wait:' restaurará el estatus de una tarea en espera a
 pendiente?
 %
 Si pone 'default.command=list project:home' en su fichero .taskrc, lanzando
 simplemente 'task' se ejecutará automáticamente 'task list project:home'.
 ¡Ahorre algo de tecleo!
 %
 Si edita su fichero pending.data asegúrese de que su editor no elimina los
 caracteres \n al final del archivo.
 %
 Si tiene que editar su fichero pending.data asegúrese de que su editor no
 transforma la codificación Unix en DOS.
 %
 ¿Tiene instalada la última versión de task? Compruebe http://taskwarrior.org
 periódicamente en busca de noticias y actualizaciones. Esa característica que
 quería puede estar lista...
 %
 No olvide la documentación en línea en http://taskwarrior.org/wiki/taskwarrior,
 y si encuentra errores, por favor, háganoslo saber. Por otra parte, se trata de
 una wiki, así que siéntase libre de corregirlos usted mismo.
 %
 No olvide la documentación en línea en http://taskwarrior.org/wiki/taskwarrior,
 pero si no puede encontrar información sobre algo en particular, cree un ticket
 solicitándola, escriba a support@taskwarrior.org pidiéndola o empiécela usted
 mismo.
 %
 ¿Sabía que hay páginas de manual para task? Pruebe 'man task', 'man taskrc',
 'man task-tutorial', 'man task-color' y 'man task-faq'.
 %
 ¿Sabía que hay varios temas en 256 colores disponibles para task?
 %
 ¿Sabía que al ejecutar 'task show' se llevarán a cabo varias comprobaciones
 en su fichero .taskrc, buscando errores?
 %
 ¿Está sacando lo mejor del color? Pruebe 'task color' para ver que colores
 soporta su sistema.
 %
 ¿Está usando proyectos? Si lo hace, taskwarrior hará un seguimiento del
 porcentaje de finalización del proyecto y le informará cada vez que cambie.
 %
 ¿Sabía que puede listar las tareas que tienen prioridad, como 'task list
 priority.above:L'?
 %
 El URL http://tasktools.org/latest puede decirle cual es la versión mas
 reciente.
 %
 Para que las tareas en su lista sean claras y aplicables, descríbalas siempre
 con un verbo al principio, como "llamar" o "limpiar" o "conseguir".
 %
 ¿No le gusta el nombre de un comando? Cree un alias.
 %
 Puede elegir si sus búsquedas son sensibles a la diferencia entre mayúsculas y
 minúsculas o no, ejecutando 'task config search.case.sensitive yes' .
 %
 Resguarde sus ficheros de datos haciendo copias del archivo ~/.taskrc y del
 directorio ~/.task .
 %
 ¿Ha cambiado una tarea sin querer? El comando undo hace inmediato recuperarse
 de cualquier cambio no deseado -- ¡incluso un borrado!
 %
 ¿Quiere ver una lista de todos los cambios que a hecho en una tarea? El informe
 info mostrará una historia completa de cambios.
 %
--- a/i18n/tips.fr-FR
+++ b/i18n/tips.fr-FR
@ -0,0 +1,76 @@
 %
 Si vous utilisez bash, essayez 'alias t=task' pour économiser quelques
 frappes de clavier.
 %
 Avez-vous essayé 'task 1 edit' pour modifier n'importe quel aspect de
 la tâche 1 à l'aide de votre éditeur de texte ?
 %
 Saviez-vous que 'task 1 wait:eom' permet de masquer la tâche 1 jusqu'à
 la fin du mois ?  Vous pouvez alors voir toutes les tâches différées
 avec 'task waiting'.
 %
 Saviez-vous que 'task 1 wait:' permet de restaurer une tâche de l'état
 différée à imminente ?
 %
 Si vous avez mis 'default.command=list project:maison' dans votre
 fichier .taskrc, alors quand vous exécuterez la commande 'task' seule,
 cela exécutera automatiquement 'task list project:maison' pour vous.
 Épargnez vous quelques frappes de clavier !
 %
 Si vous modifiez votre fichier pending.data, faites attention à ce que
 votre éditeur de texte ne supprime les caractères \n situés à la fin.
 %
 Si vous modifiez votre fichier pending.data, faites attention à ce que
 votre éditeur de texte ne change pas son encodage de Unix à DOS.
 %
 Avez-vous la dernière version de task installée ?  Suivez les annonces
 de nouvelles versions à http://taskwarrior.org.  La fonctionnalité
 que vous voulez est peut-être disponible...
 %
 N'oubliez pas les documentations en ligne à
 http://taskwarrior.org/wiki/taskwarrior, et si vous trouvez des
 erreurs, faites le nous savoir s'il vous plaît.  Encore une fois,
 c'est un wiki, alors n'hésitez pas à corriger par vous-même.
 %
 N'oubliez pas les documentations en ligne à
 http://taskwarrior.org/wiki/taskwarrior, mais si vous ne trouvez pas
 de documentation sur un sujet particulier, vous pouvez soit créer un
 ticket pour en demander, soit la demander à supporte@taskwarrior.org
 ou encore commencer à l'écrire vous-même.
 %
 Saviez-vous qu'il y a des pages man pour task ?  Essayez 'man task',
 'man taskrc', 'man task-tutorial', 'man task-color' et 'man task-faq'.
 %
 Saviez-vous qu'il y a de nombreux jeux de couleurs disponibles pour
 task ?
 %
 Saviez-vous que 'task show' permet de vérifier votre fichier .taskrc ?
 %
 Vous êtes sensible aux couleurs ?  Essayez 'task color' pour voir les
 couleurs supportées par votre système.
 %
 Vous fonctionnez par projets ?  task tient à jour un pourcentage
 d'accomplissement de chaque projet et vous prévient quand il change.
 %
 Saviez-vous que vous pouvez lister les tâches ayant une certaine
 priorité avec 'task list priority.above:L' ?
 %
 L'URL http://tasktools.org/latest vous indique la dernière version de task.
 %
 Pour rendre vos tâches claires et plus concrètes, décrivez les
 toujours en commençant par un verbe, comme "appeler" ou "écrire".
 %
 Vous n'aimez pas le nom d'une commande ?  Créez un alias !
 %
 Vous voulez que vos recherches soient insensibles à la casse ?
 Exécutez la commande 'task config search.case.sensitive no'
 %
 Sauvegardez vos données en copiant le fichier ~/.taskrc et le
 répertoire ~/.task !
 %
 Vous avez accidentellement modifié une tâche ?  La commande 'undo'
 vous permet d'annuler tout changement, même une suppression de tâche.
 %
 Vous voulez voir une liste des changements que vous avez fait à vos
 tâches ? La commande 'info' vous affichera un historique complet.
 %
--- a/i18n/tips.it-IT
+++ b/i18n/tips.it-IT
@ -1,7 +1,7 @@
 %
 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
+Hai provato 'task 1 edit' 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
--- a/i18n/tips.ja-JP
+++ b/i18n/tips.ja-JP
@ -1,7 +1,7 @@
 %
 bashユーザーなら、'alias t=task'としてキー入力を減らしてみてください。
 %
-'task edit 1'とすると、タスク1のあらゆる要素をテキストエディタで編集
+'task 1 edit'とすると、タスク1のあらゆる要素をテキストエディタで編集
 できます。試してみましたか？
 %
 'task 1 wait:eom'とすると、月末までタスク1を隠す（待機させる）ことが
--- a/i18n/tips.sv-SE
+++ b/i18n/tips.sv-SE
@ -1,7 +1,7 @@
 %
 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?
+Har du försökt att använda 'task 1 edit' 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'.
--- a/package-config/osx/README
+++ b/package-config/osx/README
@ -242,7 +242,7 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
  $ /usr/local/bin/task version
  task 2.0.0 built for darwin
-  Copyright (C) 2006 - 2012 P. Beckingham, F. Hernandez.
+  Copyright (C) 2006 - 2013 P. Beckingham, F. Hernandez.
  Taskwarrior may be copied only under the terms of the GNU General Public
  License, which may be found in the taskwarrior source kit.
@ -254,7 +254,7 @@ Note: This is being written from the OSX 10.6 perspective, and may therefore
  $ man task
  ...
  ...
-  task 2.0.0             2012-01-10                task 2.0.0
+  task 2.0.0             2013-01-10                task 2.0.0
  The man page should list 2.0.0 as the version number, but the date will be
  different.
--- a/performance/.gitignore
+++ b/performance/.gitignore
@ -0,0 +1,2 @@
 *.data
 *.rc
--- a/performance/CMakeLists.txt
+++ b/performance/CMakeLists.txt
@ -0,0 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
 add_custom_target (performance ./run_perf
                               DEPENDS task_executable
                               WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/performance)
--- a/performance/load
+++ b/performance/load
--- a/performance/run_perf
+++ b/performance/run_perf
@ -0,0 +1,31 @@
 #! /bin/sh
 echo 'Performance: setup'
 echo '  - This step will take several minutes'
 rm -f ./pending.data ./completed.data ./undo.data perf.rc
 ./load
 # Run benchmarks.
 # Note that commands are run twice - warm cache testing.
 echo 'Performance: benchmarks'
 echo '  - task next...'
 ../src/task rc.debug:1 rc:perf.rc next >/dev/null 2>&1
 ../src/task rc.debug:1 rc:perf.rc next 2>&1 | grep "Perf task"
 echo '  - task list...'
 ../src/task rc.debug:1 rc:perf.rc list >/dev/null 2>&1
 ../src/task rc.debug:1 rc:perf.rc list 2>&1 | grep "Perf task"
 echo '  - task all...'
 ../src/task rc.debug:1 rc:perf.rc all >/dev/null 2>&1
 ../src/task rc.debug:1 rc:perf.rc all 2>&1 | grep "Perf task"
 echo '  - task add...'
 ../src/task rc.debug:1 rc:perf.rc add >/dev/null 2>&1
 ../src/task rc.debug:1 rc:perf.rc add This is a task with an average sized description length project:P priority:H +tag1 +tag2 2>&1 | grep "Perf task"
 echo 'End'
 exit 0
--- a/scripts/add-ons/export-csv.pl
+++ b/scripts/add-ons/export-csv.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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
@ -38,7 +38,7 @@ if ($@)
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
-my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
+my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
@ -53,6 +53,9 @@ for my $task (split /,$/ms, qx{$command})
 {
  my $data = from_json ($task);
  my $desc = $data->{'description'};
  $desc =~ s/'/\\'/g;
  print "'$data->{'uuid'}',",
        "'$data->{'status'}',",
        "'", (exists $data->{'tags'} ? join (' ', @{$data->{'tags'}}) : ''), "',",
@ -65,7 +68,7 @@ for my $task (split /,$/ms, qx{$command})
        "'", ($data->{'priority'} || ''), "',",
        "'", ($data->{'fg'}       || ''), "',",
        "'", ($data->{'bg'}       || ''), "',",
-        "'$data->{'description'}'",
+        "'$desc'",
        "\n";
  # Note that this format ignores:
@ -74,6 +77,7 @@ for my $task (split /,$/ms, qx{$command})
  #   annotations
  #   mask
  #   imask
  #   UDAs
 }
 exit 0;
--- a/scripts/add-ons/export-html.pl
+++ b/scripts/add-ons/export-html.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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
@ -38,7 +38,7 @@ if ($@)
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
-my $command = join (' ', ("env PATH='$ENV{PATH}' task export", @ARGV));
+my $command = join (' ', ("env PATH='$ENV{PATH}' task rc.verbose=nothing rc.json.array=no export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
--- a/scripts/add-ons/export-ical.pl
+++ b/scripts/add-ons/export-ical.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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
@ -38,7 +38,7 @@ if ($@)
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
-my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
+my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
--- a/scripts/add-ons/export-sql.py
+++ b/scripts/add-ons/export-sql.py
@ -2,7 +2,7 @@
 ###############################################################################
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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
@ -141,7 +141,7 @@ def main():
    """ Return a list of SQL statements. """
    # Use the taskwarrior 2.0+ export command to filter and return JSON
-    command = "task export " + " ".join(sys.argv[1:])
+    command = "task rc.verbose=nothing rc.json.array=no export " + " ".join(sys.argv[1:])
    # Load each task from json to a python dict
    tasks = map(json.loads, commands.getoutput(command).split(",\n"))
--- a/scripts/add-ons/export-tsv.pl
+++ b/scripts/add-ons/export-tsv.pl
@ -0,0 +1,83 @@
 #! /usr/bin/perl
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
 ## Copyright 2006-2013, 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
 ##
 ################################################################################
 use strict;
 use warnings;
 # Give a nice error if the (non-standard) JSON module is not installed.
 eval "use JSON";
 if ($@)
 {
  print "Error: You need to install the JSON Perl module.\n";
  exit 1;
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
 my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
  exit 1;
 }
 # Generate output.
 print "uuid\tstatus\ttags\tentry\tstart\tdue\trecur\tend\tproject\t",
      "priority\tfg\tbg\tdescription\n";
 for my $task (split /,$/ms, qx{$command})
 {
  my $data = from_json ($task);
  print "$data->{'uuid'}\t",
        "$data->{'status'}\t",
        (exists $data->{'tags'} ? join (' ', @{$data->{'tags'}}) : ''), "\t",
        "$data->{'entry'}\t",
        ($data->{'start'}    || ''), "\t",
        ($data->{'due'}      || ''), "\t",
        ($data->{'recur'}    || ''), "\t",
        ($data->{'end'}      || ''), "\t",
        ($data->{'project'}  || ''), "\t",
        ($data->{'priority'} || ''), "\t",
        ($data->{'fg'}       || ''), "\t",
        ($data->{'bg'}       || ''), "\t",
        "$data->{'description'}",
        "\n";
  # Note that this format ignores:
  #   wait
  #   until
  #   annotations
  #   mask
  #   imask
  #   UDAs
 }
 exit 0;
 ################################################################################
--- a/scripts/add-ons/export-xml.pl
+++ b/scripts/add-ons/export-xml.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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
@ -38,7 +38,7 @@ if ($@)
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
-my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
+my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
--- a/scripts/add-ons/export-xml.py
+++ b/scripts/add-ons/export-xml.py
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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
@ -31,7 +31,7 @@ import commands
 import json
 # Use the taskwarrior 2.0+ export command to filter and return JSON
-command = "/usr/local/bin/task export " + " ".join (sys.argv[1:])
+command = "/usr/local/bin/task rc.verbose=nothing rc.json.array=no export " + " ".join (sys.argv[1:])
 # Generate output.
 print "<tasks>"
--- a/scripts/add-ons/export-xml.rb
+++ b/scripts/add-ons/export-xml.rb
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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
@ -30,7 +30,7 @@ require 'rubygems'
 require 'json'
 # Use the taskwarrior 2.0+ export command to filter and return JSON
-lines = IO.popen("/usr/local/bin/task export " + ARGV.join(" ")).readlines
+lines = IO.popen("/usr/local/bin/task rc.verbose=nothing rc.json.array=no export " + ARGV.join(" ")).readlines
 # Generate output.
 print "<tasks>\n"
--- a/scripts/add-ons/export-yad.pl
+++ b/scripts/add-ons/export-yad.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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
@ -38,7 +38,7 @@ if ($@)
 }
 # Use the taskwarrior 2.0+ export command to filter and return JSON
-my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
+my $command = join (' ', ("env PATH=$ENV{PATH} task rc.verbose=nothing rc.json.array=no export", @ARGV));
 if ($command =~ /No matches/)
 {
  printf STDERR $command;
--- a/scripts/add-ons/export-yaml.pl
+++ b/scripts/add-ons/export-yaml.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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/scripts/add-ons/import-todo.sh.pl
+++ b/scripts/add-ons/import-todo.sh.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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/scripts/add-ons/import-yaml.pl
+++ b/scripts/add-ons/import-yaml.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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
@ -190,7 +190,7 @@ if (open my $fh, '>:utf8', $file)
        "# ${url_current}\n",
        "# ${url_next}\n",
        "#\n",
-        "# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.\n",
+        "# Copyright 2006-2013, Paul Beckingham, Federico Hernandez.\n",
        "#\n",
        "# Permission is hereby granted, free of charge, to any person obtaining a copy\n",
        "# of this software and associated documentation files (the \"Software\"), to deal\n",
--- a/scripts/bash/task.sh
+++ b/scripts/bash/task.sh
@ -2,7 +2,7 @@
 # bash completion support for taskwarrior
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2013, 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
@ -62,10 +62,6 @@ _task_get_config() {
    $taskcommand _config
 }
 _task_offer_dependencies() {
    COMPREPLY=( $(compgen -W "$($taskcommand _ids)" -- ${cur/*:/}) )
 }
 _task_offer_priorities() {
    COMPREPLY=( $(compgen -W "L M H" -- ${cur/*:/}) )
 }
@ -94,17 +90,11 @@ _task()
    abbrev_min=$($taskcommand show | grep "abbreviation.minimum" | awk {'print  $2'})
    commands_aliases=$(echo $($taskcommand _commands; $taskcommand _aliases) | tr " " "\n"|sort|tr "\n" " ")
-    opts="$commands_aliases $($taskcommand _ids) $($taskcommand _columns)"
+    opts="$commands_aliases $($taskcommand _columns)"
    case "${prev}" in
        :)
            case "${prev2}" in
                dep|depe|depen|depend|depends)
                    if [ ${#prev2} -ge $abbrev_min ]; then
                        _task_offer_dependencies
                    fi
                    return 0
                    ;;
                pri|prior|priori|priorit|priority)
                    if [ ${#prev2} -ge $abbrev_min ]; then
                        _task_offer_priorities
@ -117,6 +107,15 @@ _task()
                    fi
                    return 0
                    ;;
                rc)
                    # not activated when only "rc:" but is activated if anything after "rc:"
                   _filedir
                   return 0
                    ;;
                rc.data.location)
                   _filedir -d
                   return 0
                   ;;
            esac
            ;;
        *)
@ -127,12 +126,6 @@ _task()
                    ;;
                :)
                    case "${prev}" in
                        dep|depe|depen|depend|depends)
                            if [ ${#prev} -ge $abbrev_min ]; then
                                _task_offer_dependencies
                            fi
                            return 0
                            ;;
                        pri|prior|priori|priorit|priority)
                            if [ ${#prev} -ge $abbrev_min ]; then
                                _task_offer_priorities
@ -145,6 +138,17 @@ _task()
                            fi
                            return 0
                            ;;
                        rc)
                            # activated only when "rc:"
                            cur="" # otherwise ":" is passed.
                            _filedir
                            return 0
                            ;;
                        rc.data.location)
                            cur=""
                            _filedir -d
                            return 0
                            ;;
                    esac
                    ;;
                +*)
--- a/scripts/fish/task.fish
+++ b/scripts/fish/task.fish
@ -12,7 +12,7 @@
 #  * Tags
 #  * Attribute names and modifiers
 #
-#  Copyright 2009 - 2012 Mick Koch <kchmck@gmail.com>
+#  Copyright 2009 - 2013 Mick Koch <kchmck@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/scripts/utils/verify_strings
+++ b/scripts/utils/verify_strings
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2013, 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/scripts/vim/README
+++ b/scripts/vim/README
@ -53,7 +53,7 @@ You should then be ready to go.
 ---
 All four above mentioned files are
-Copyright 2009 - 2012 John Florian
+Copyright 2009 - 2013 John Florian
 and are available under the MIT license.
 For the full text of this license, see COPYING.
--- a/scripts/vim/ftdetect/task.vim
+++ b/scripts/vim/ftdetect/task.vim
@ -4,7 +4,7 @@
 " Maintainer:   John Florian <jflorian@doubledog.org>
 " Updated:	Thu Dec 10 18:28:26 EST 2009
 "
-" Copyright 2009 - 2012 John Florian
+" Copyright 2009 - 2013 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/vim/syntax/taskdata.vim
+++ b/scripts/vim/syntax/taskdata.vim
@ -3,7 +3,7 @@
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Wed Jul  8 19:46:20 EDT 2009
 "
-" Copyright 2009 - 2012 John Florian
+" Copyright 2009 - 2013 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/vim/syntax/taskedit.vim
+++ b/scripts/vim/syntax/taskedit.vim
@ -3,7 +3,7 @@
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Wed Jul  8 19:46:32 EDT 2009
 "
-" Copyright 2009 - 2012 John Florian
+" Copyright 2009 - 2013 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/vim/syntax/taskrc.vim
+++ b/scripts/vim/syntax/taskrc.vim
@ -3,7 +3,7 @@
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Sat Feb 20 14:14:44 EST 2010
 "
-" Copyright 2009 - 2012 John Florian
+" Copyright 2009 - 2013 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2010 - 2012 Johannes Schlatow
+# Copyright 2010 - 2013 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/src/A3.cpp
+++ b/src/A3.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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
@ -97,7 +97,7 @@ static struct
  {  "_hastag_", 9,         'b',  0,      'l'},     // +tag  [Pseudo-op]
  {  "_notag_",  9,         'b',  0,      'l'},     // -tag  [Pseudo-op]
-//  {  "-",       15,         'u',  1,      'r' },    // Unary minus
+  {  "-",       15,         'u',  1,      'r' },    // Unary minus
  {  "*",       13,         'b',  1,      'l' },    // Multiplication
  {  "/",       13,         'b',  1,      'l' },    // Division
 //  {  "%",       13,         'b',  1,      'l' },    // Modulus
--- a/src/A3.h
+++ b/src/A3.h
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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/src/Arg.cpp
+++ b/src/Arg.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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/src/Arg.h
+++ b/src/Arg.h
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -30,6 +30,7 @@ set (task_SRCS A3.cpp A3.h
               TransportCurl.cpp TransportCurl.h
               TransportRSYNC.cpp TransportRSYNC.h
               TransportSSH.cpp TransportSSH.h
               TransportShell.cpp TransportShell.h
               Uri.cpp Uri.h
               ViewTask.cpp ViewTask.h
               ViewText.cpp ViewText.h
--- a/src/Color.cpp
+++ b/src/Color.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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/src/Color.h
+++ b/src/Color.h
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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/src/Config.cpp
+++ b/src/Config.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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
@ -31,12 +31,10 @@
 #include <fstream>
 #include <sstream>
 #include <algorithm>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <inttypes.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <pwd.h>
 #include <Directory.h>
 #include <Date.h>
 #include <File.h>
@ -114,7 +112,9 @@ std::string Config::_defaults =
  "dateformat.info=Y-M-D H:N:S                    # Preferred display date format for information\n"
  "dateformat.report=                             # Preferred display date format for reports\n"
  "dateformat.annotation=                         # Preferred display date format for annotations\n"
-  "weekstart=Sunday                               # Sunday or Monday only\n"
+  "weekstart="
             STRING_DATE_SUNDAY_LONG
                  "                               # Sunday or Monday only\n"
  "displayweeknumber=yes                          # Show week numbers on calendar\n"
  "due=7                                          # Task is considered due in 7 days\n"
  "\n"
@ -212,6 +212,7 @@ std::string Config::_defaults =
  "color.blocking=white on color6                 # Color of blocking tasks\n"
  "#color.completed=on blue                       # Color of completed tasks\n"
  "#color.deleted=on blue                         # Color of deleted tasks\n"
  "#color.uda.estimate=on green                   # Color of UDA\n"
 #else
  "color.header=yellow                            # Color of header messages\n"
  "color.footnote=yellow                          # Color of footnote messages\n"
@ -266,12 +267,13 @@ std::string Config::_defaults =
  "color.blocking=black on bright white           # Color of blocking tasks\n"
  "#color.completed=on blue                       # Color of completed tasks\n"
  "#color.deleted=on blue                         # Color of deleted tasks\n"
  "#color.uda.estimate=on green                   # Color of UDA\n"
 #endif
  "\n"
  "# Here is the rule precedence order, highest to lowest.\n"
  "# Note that these are just the color rule names, without the leading 'color.'\n"
  "#      and any trailing '.value'.\n"
-  "rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,recurring,pri.,tagged,completed,deleted\n"
+  "rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted\n"
  "\n"
  "# Shadow file support\n"
  "#shadow.file=/tmp/shadow.txt                   # Location of shadow file\n"
@ -288,6 +290,7 @@ std::string Config::_defaults =
  "complete.all.tags=no                           # Include old tag names in '_ags' command\n"
  "list.all.projects=no                           # Include old project names in 'projects' command\n"
  "list.all.tags=no                               # Include old tag names in 'tags' command\n"
  "print.empty.columns=no                         # Print columns which have no data for any task\n"
  "debug=no                                       # Display diagnostics\n"
  "extensions=off                                 # Extension system master switch\n"
  "fontunderline=yes                              # Uses underlines rather than -------\n"
@ -312,103 +315,103 @@ std::string Config::_defaults =
  "\n"
  "report.long.description=Lists all pending tasks\n"
  "report.long.columns=id,project,priority,entry,start,due,recur,due.countdown,entry.age,depends,tags,description\n"
-  "report.long.labels=ID,Project,Pri,Added,Started,Due,Recur,Countdown,Age,Deps,Tags,Description\n"
+  "report.long.labels=ID,Proj,Pri,Added,Started,Due,Recur,Countdown,Age,Deps,Tags,Description\n"
  "report.long.sort=due+,priority-,project+\n"
  "report.long.filter=status:pending\n"
  "\n"
  "report.list.description=Lists all pending tasks\n"
  "report.list.columns=id,project,priority,due,start.active,entry.age,description\n"
-  "report.list.labels=ID,Project,Pri,Due,Active,Age,Description\n"
+  "report.list.labels=ID,Proj,Pri,Due,Active,Age,Description\n"
  "report.list.sort=due+,priority-,start-,project+\n"
  "report.list.filter=status:pending\n"
  "\n"
  "report.ls.description=Minimal listing of all pending tasks\n"
  "report.ls.columns=id,project,priority,description\n"
-  "report.ls.labels=ID,Project,Pri,Description\n"
+  "report.ls.labels=ID,Proj,Pri,Description\n"
  "report.ls.sort=priority-,project+\n"
  "report.ls.filter=status:pending\n"
  "\n"
  "report.minimal.description=Minimal listing of all pending tasks\n"
  "report.minimal.columns=id,project,description.truncated\n"
-  "report.minimal.labels=ID,Project,Description\n"
+  "report.minimal.labels=ID,Proj,Description\n"
  "report.minimal.sort=project+,description+\n"
  "report.minimal.filter=status:pending\n"
  "\n"
  "report.newest.description=Shows the newest tasks\n"
  "report.newest.columns=id,project,priority,due,start.active,entry.age,description\n"
-  "report.newest.labels=ID,Project,Pri,Due,Active,Age,Description\n"
+  "report.newest.labels=ID,Proj,Pri,Due,Active,Age,Description\n"
  "report.newest.sort=id-\n"
  "report.newest.filter=status:pending limit:10\n"
  "\n"
  "report.oldest.description=Shows the oldest tasks\n"
  "report.oldest.columns=id,project,priority,due,start.active,entry.age,description\n"
-  "report.oldest.labels=ID,Project,Pri,Due,Active,Age,Description\n"
+  "report.oldest.labels=ID,Proj,Pri,Due,Active,Age,Description\n"
  "report.oldest.sort=id+\n"
  "report.oldest.filter=status:pending limit:10\n"
  "\n"
  "report.overdue.description=Lists overdue tasks\n"
  "report.overdue.columns=id,project,priority,due,start.active,entry.age,description\n"
-  "report.overdue.labels=ID,Project,Pri,Due,Active,Age,Description\n"
+  "report.overdue.labels=ID,Proj,Pri,Due,Active,Age,Description\n"
  "report.overdue.sort=due+,priority-,start-,project+\n"
  "report.overdue.filter=status:pending +OVERDUE\n"
  "\n"
  "report.active.description=Lists active tasks\n"
  "report.active.columns=id,project,priority,due,start.active,entry.age,description\n"
-  "report.active.labels=ID,Project,Pri,Due,Active,Age,Description\n"
+  "report.active.labels=ID,Proj,Pri,Due,Active,Age,Description\n"
  "report.active.sort=due+,priority-,project+\n"
  "report.active.filter=status:pending start.any:\n"
  "\n"
  "report.completed.description=Lists completed tasks\n"
  "report.completed.columns=end,project,priority,entry.age,description,uuid\n"
-  "report.completed.labels=Complete,Project,Pri,Age,Description,UUID\n"
+  "report.completed.labels=Complete,Proj,Pri,Age,Description,UUID\n"
  "report.completed.sort=end+,priority-,project+\n"
  "report.completed.filter=status:completed\n"
  "\n"
  "report.recurring.description=Lists recurring tasks\n"
  "report.recurring.columns=id,project,priority,due,recur,start.active,entry.age,description\n"
-  "report.recurring.labels=ID,Project,Pri,Due,Recur,Active,Age,Description\n"
+  "report.recurring.labels=ID,Proj,Pri,Due,Recur,Active,Age,Description\n"
  "report.recurring.sort=due+,priority-,start-,project+\n"
  "report.recurring.filter=status:pending parent.any:\n"
  "\n"
  "report.waiting.description=Lists all waiting tasks\n"
  "report.waiting.columns=id,project,priority,wait,entry.age,description\n"
-  "report.waiting.labels=ID,Project,Pri,Wait,Age,Description\n"
+  "report.waiting.labels=ID,Proj,Pri,Wait,Age,Description\n"
  "report.waiting.sort=wait+,priority-,project+\n"
  "report.waiting.filter=status:waiting\n"
  "\n"
  "report.all.description=Lists all pending and completed tasks\n"
  "report.all.columns=id,status,project,priority,due,end,start.active,entry.age,description\n"
-  "report.all.labels=ID,Status,Project,Pri,Due,Completed,Active,Age,Description\n"
+  "report.all.labels=ID,Status,Proj,Pri,Due,Completed,Active,Age,Description\n"
  "report.all.sort=entry+\n"
  "report.all.filter=status.not:deleted\n"
  "\n"
  "report.next.description=Lists the most urgent tasks\n"
  "report.next.columns=id,project,priority,due,start.active,entry.age,urgency,description\n"
-  "report.next.labels=ID,Project,Pri,Due,A,Age,Urgency,Description\n"
+  "report.next.labels=ID,Proj,Pri,Due,A,Age,Urg,Description\n"
  "report.next.sort=urgency-,due+,priority-,start-,project+\n"
  "report.next.filter=status:pending limit:page\n"
  "\n"
  "report.ready.description=Lists the most urgent tasks\n"
  "report.ready.columns=id,project,priority,due,start.active,entry.age,urgency,description\n"
-  "report.ready.labels=ID,Project,Pri,Due,A,Age,Urgency,Description\n"
+  "report.ready.labels=ID,Proj,Pri,Due,A,Age,Urg,Description\n"
  "report.ready.sort=urgency-,due+,priority-,start-,project+\n"
  "report.ready.filter=status:pending limit:page wait.none: '(scheduled.none: or scheduled.before:now )'\n"
  "\n"
  "report.blocked.description=Lists all blocked tasks\n"
  "report.blocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n"
-  "report.blocked.labels=ID,Deps,Project,Pri,Due,Active,Age,Description\n"
+  "report.blocked.labels=ID,Deps,Proj,Pri,Due,Active,Age,Description\n"
  "report.blocked.sort=due+,priority-,start-,project+\n"
  "report.blocked.filter=status:pending +BLOCKED\n"
  "\n"
  "report.unblocked.description=Lists all unblocked tasks\n"
  "report.unblocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n"
-  "report.unblocked.labels=ID,Deps,Project,Pri,Due,Active,Age,Description\n"
+  "report.unblocked.labels=ID,Deps,Proj,Pri,Due,Active,Age,Description\n"
  "report.unblocked.sort=due+,priority-,start-,project+\n"
  "report.unblocked.filter=status:pending -BLOCKED\n"
  "\n"
  "report.blocking.description=Lists all blocking tasks\n"
  "report.blocking.columns=id,depends,project,priority,due,start.active,entry.age,description\n"
-  "report.blocking.labels=ID,Deps,Project,Pri,Due,Active,Age,Description\n"
+  "report.blocking.labels=ID,Deps,Proj,Pri,Due,Active,Age,Description\n"
  "report.blocking.sort=due+,priority-,start-,project+\n"
  "report.blocking.filter=status:pending +BLOCKING\n"
  "\n";
--- a/src/Config.h
+++ b/src/Config.h
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006 - 2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006 - 2013, Paul Beckingham, Federico Hernandez.
 // All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/src/Context.cpp
+++ b/src/Context.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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
@ -32,7 +32,6 @@
 #include <sstream>
 #include <algorithm>
 #include <assert.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@ -536,6 +535,7 @@ void Context::shadow ()
              " rc.detection:off"   +  // No need to determine terminal size
              " rc.color:off"       +  // Color off by default
              " rc.gc:off "         +  // GC off, to reduce headaches
              " rc.locking:off"     +  // No file locking
              " rc:" + rcfile + " " +  // Use specified rc file
              command               +  // User specified command
              " >"                  +  // Capture
@ -576,18 +576,8 @@ const std::vector <std::string> Context::getCommands () const
 ////////////////////////////////////////////////////////////////////////////////
 void Context::assumeLocations ()
 {
-  // Note that this pointer is deliberately not free()'d, even though valgrind
+  rc_file  = File      ("~/.taskrc");
-  // complains about it.  It is either not necessary, or forbidden, depending
+  data_dir = Directory ("~/.task");
  // on OS.
  // Set up default locations.
  struct passwd* pw = getpwuid (getuid ());
  if (!pw)
    throw std::string (STRING_NO_HOME);
  home_dir = pw->pw_dir;
  rc_file  = File      (home_dir + "/.taskrc");
  data_dir = Directory (home_dir + "/.task");
 }
 ////////////////////////////////////////////////////////////////////////////////
@ -600,14 +590,14 @@ void Context::createDefaultConfig ()
        !confirm (format (STRING_CONTEXT_CREATE_RC, home_dir, rc_file._data)))
      throw std::string (STRING_CONTEXT_NEED_RC);
-    config.createDefaultRC (rc_file, data_dir);
+    config.createDefaultRC (rc_file, data_dir._original);
  }
  // Create data location, if necessary.
  config.createDefaultData (data_dir);
  // Create extension directory, if necessary.
-/* TODO Enable this when the time is right, say for 2.1
+/* TODO Enable this when the time is right, say for 2.4
  if (! extension_dir.exists ())
    extension_dir.create ();
 */
@ -683,14 +673,14 @@ void Context::clear ()
 // this output?'.
 void Context::updateXtermTitle ()
 {
-  if (config.getBoolean ("xterm.title"))
+  if (config.getBoolean ("xterm.title") && isatty (fileno (stdout)))
  {
    std::string command;
    a3.find_command (command);
    std::string title;
    join (title, " ", a3.list ());
-    std::cout << "]0;task " << command << " " << title << "" << std::endl;
+    std::cout << "]0;task " << command << " " << title << "";
  }
 }
--- a/src/Context.h
+++ b/src/Context.h
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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/src/DOM.cpp
+++ b/src/DOM.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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
@ -77,13 +77,6 @@ const std::vector <std::string> DOM::get_references () const
 //   system.os
 const std::string DOM::get (const std::string& name)
 {
  // Cache test.
 /*
  std::map <std::string, std::string>::iterator hit = _cache.find (name);
  if (hit != _cache.end ())
    return hit->second;
 */
  int len = name.length ();
  Nibbler n (name);
@ -91,17 +84,17 @@ const std::string DOM::get (const std::string& name)
  if (len > 3 &&
      name.substr (0, 3) == "rc.")
  {
-    return /*_cache[name] =*/ context.config.get (name.substr (3));
+    return context.config.get (name.substr (3));
  }
  // context.*
  else if (len > 8 &&
           name.substr (0, 8) == "context.")
  {
-         if (name == "context.program") return /*_cache[name] =*/ context.a3[0]._raw;
+         if (name == "context.program") return context.a3[0]._raw;
-    else if (name == "context.args")    return /*_cache[name] =*/ context.a3.combine ();
+    else if (name == "context.args")    return context.a3.combine ();
-    else if (name == "context.width")   return /*_cache[name] =*/ format (context.terminal_width);
+    else if (name == "context.width")   return format (context.terminal_width);
-    else if (name == "context.height")  return /*_cache[name] =*/ format (context.terminal_height);
+    else if (name == "context.height")  return format (context.terminal_height);
    else                                throw format (STRING_DOM_UNREC, name);
  }
@ -113,28 +106,28 @@ const std::string DOM::get (const std::string& name)
  {
    // Taskwarrior version number.
    if (name == "system.version")
-      return /*_cache[name] =*/ VERSION;
+      return VERSION;
    // OS type.
    else if (name == "system.os")
 #if defined (DARWIN)
-      return /*_cache[name] =*/ "Darwin";
+      return "Darwin";
 #elif defined (SOLARIS)
-      return /*_cache[name] =*/ "Solaris";
+      return "Solaris";
 #elif defined (CYGWIN)
-      return /*_cache[name] =*/ "Cygwin";
+      return "Cygwin";
 #elif defined (HAIKU)
-      return /*_cache[name] =*/ "Haiku";
+      return "Haiku";
 #elif defined (OPENBSD)
-      return /*_cache[name] =*/ "OpenBSD";
+      return "OpenBSD";
 #elif defined (FREEBSD)
-      return /*_cache[name] =*/ "FreeBSD";
+      return "FreeBSD";
 #elif defined (NETBSD)
-      return /*_cache[name] =*/ "NetBSD";
+      return "NetBSD";
 #elif defined (LINUX)
-      return /*_cache[name] =*/ "Linux";
+      return "Linux";
 #else
-      return /*_cache[name] =*/ STRING_DOM_UNKNOWN;
+      return STRING_DOM_UNKNOWN;
 #endif
    else
@ -142,7 +135,7 @@ const std::string DOM::get (const std::string& name)
  }
  // Pass-through.
-  return /*_cache[name] =*/ name;
+  return name;
 }
 ////////////////////////////////////////////////////////////////////////////////
@ -183,13 +176,6 @@ const std::string DOM::get (const std::string& name)
 //
 const std::string DOM::get (const std::string& name, const Task& task)
 {
  // Cache test.
 /*
  std::map <std::string, std::string>::iterator hit = _cache.find (name);
  if (hit != _cache.end ())
    return hit->second;
 */
  Nibbler n (name);
  int id;
  std::string uuid;
@ -253,7 +239,7 @@ void DOM::set (const std::string& name, const std::string& value)
  if (len > 3 &&
      name.substr (0, 3) == "rc.")
  {
-    context.config.set (name.substr (3), /*_cache[name] =*/ value);
+    context.config.set (name.substr (3), value);
  }
  // Unrecognized --> error.
--- a/src/DOM.h
+++ b/src/DOM.h
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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
@ -45,7 +45,6 @@ public:
  void set (const std::string&, const std::string&);
 private:
  std::map <std::string, std::string> _cache;
 };
 #endif
--- a/src/Date.cpp
+++ b/src/Date.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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
@ -56,12 +56,14 @@ static const char* relatives[] =
  "eow",
  "eoww",
  "eocw",
  "eocm",
  "eom",
  "eoq",
  "eoy",
  "sow",
  "soww",
  "socw",
  "socm",
  "som",
  "soq",
  "soy",
@ -235,9 +237,9 @@ const std::string Date::toString (
    case 'y': sprintf (buffer, "%02d",  this->year () % 100);                   break;
    case 'Y': sprintf (buffer, "%d",    this->year ());                         break;
    case 'a': sprintf (buffer, "%.3s",  Date::dayName (dayOfWeek ()).c_str ()); break;
-    case 'A': sprintf (buffer, "%s",   Date::dayName (dayOfWeek ()).c_str ()); break;
+    case 'A': sprintf (buffer, "%.10s", Date::dayName (dayOfWeek ()).c_str ()); break;
    case 'b': sprintf (buffer, "%.3s",  Date::monthName (month ()).c_str ());   break;
-    case 'B': sprintf (buffer, "%.9s", Date::monthName (month ()).c_str ());   break;
+    case 'B': sprintf (buffer, "%.10s", Date::monthName (month ()).c_str ());   break;
    case 'v': sprintf (buffer, "%d",    Date::weekOfYear (Date::dayOfWeek (context.config.get ("weekstart")))); break;
    case 'V': sprintf (buffer, "%02d",  Date::weekOfYear (Date::dayOfWeek (context.config.get ("weekstart")))); break;
    case 'h': sprintf (buffer, "%d",    this->hour ());                         break;
@ -525,16 +527,23 @@ int Date::length (const std::string& format)
    case 'd':
    case 'D':
    case 'y':
-    case 'A':
+    case 'v':
    case 'b':
    case 'B':
    case 'V':
    case 'h':
    case 'H':
    case 'n':
    case 'N':
    case 's':
    case 'S': total += 2;  break;
    case 'b':
    case 'j':
    case 'J':
    case 'a': total += 3;  break;
    case 'Y': total += 4;  break;
    case 'A':
    case 'B': total += 10; break;
    // TODO This should be a calculated character width, not necessarily 1.
    default:  total += 1; break;
    }
  }
@ -878,7 +887,7 @@ bool Date::isRelativeDate (const std::string& input)
      _t = then._t - 86400;
      return true;
    }
-    else if (found == "eom")
+    else if (found == "eom" || found == "eocm")
    {
      Date then (today.month (),
                 daysInMonth (today.month (), today.year ()),
@ -901,6 +910,14 @@ bool Date::isRelativeDate (const std::string& input)
      _t = then._t;
      return true;
    }
    else if (found == "socm")
    {
      int m = today.month ();
      int y = today.year ();
      Date then (m, 1, y);
      _t = then._t;
      return true;
    }
    else if (found == "som")
    {
      int m = today.month () + 1;
--- a/src/Date.h
+++ b/src/Date.h
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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/src/Directory.cpp
+++ b/src/Directory.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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
@ -111,13 +111,14 @@ bool Directory::remove_directory (const std::string& dir)
 #if defined (SOLARIS) || defined (HAIKU)
      struct stat s;
-      stat ((dir + "/" + de->d_name).c_str (), &s);
+      lstat ((dir + "/" + de->d_name).c_str (), &s);
      if (s.st_mode & S_IFDIR)
        remove_directory (dir + "/" + de->d_name);
      else
        unlink ((dir + "/" + de->d_name).c_str ());
 #else
-      if (de->d_type == DT_DIR)
+      if (de->d_type == DT_DIR ||
          de->d_type == DT_UNKNOWN)
        remove_directory (dir + "/" + de->d_name);
      else
        unlink ((dir + "/" + de->d_name).c_str ());
--- a/src/Directory.h
+++ b/src/Directory.h
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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/src/Duration.cpp
+++ b/src/Duration.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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
@ -282,7 +282,7 @@ std::string Duration::formatCompact () const
  else if (_secs >= 3600)        sprintf (formatted, "%s%dh",   (_negative ? "-" : ""), (int) (_secs / 3600));
  else if (_secs >= 60)          sprintf (formatted, "%s%dm",   (_negative ? "-" : ""), (int) (_secs / 60));
  else if (_secs >= 1)           sprintf (formatted, "%s%ds",   (_negative ? "-" : ""), (int) _secs);
-  else                           strcpy (formatted, "-");
+  else                           formatted[0] = '\0';
  return std::string (formatted);
 }
--- a/src/Duration.h
+++ b/src/Duration.h
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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/src/E9.cpp
+++ b/src/E9.cpp
@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, 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
@ -337,6 +337,32 @@ void E9::operator_lt (Arg& result, Arg& left, Arg& right)
                    : "false";
    }
  }
  else if (left._type  == Arg::type_duration ||
           right._type == Arg::type_duration)
  {
    if (left._value == "" ||
        right._value == "")
      result._value = "false";
    else
    {
      Duration left_duration  (left._value);
      Duration right_duration (right._value);
      result._value = (left_duration < right_duration)
                    ? "true"
                    : "false";
    }
  }
  else if (left._type  == Arg::type_number ||
           right._type == Arg::type_number)
  {
    float left_number  = strtof (left._value.c_str (), NULL);
    float right_number = strtof (right._value.c_str (), NULL);
    result._value = (left_number < right_number)
                  ? "true"
                  : "false";
  }
  else
  {
    result._value = (left._value < right._value)
@ -376,6 +402,32 @@ void E9::operator_lte (Arg& result, Arg& left, Arg& right)
                    : "false";
    }
  }
  else if (left._type  == Arg::type_duration ||
           right._type == Arg::type_duration)
  {
    if (left._value == "" ||
        right._value == "")
      result._value = "false";
    else
    {
      Duration left_duration  (left._value);
      Duration right_duration (right._value);
      result._value = (left_duration <= right_duration)
                    ? "true"
                    : "false";
    }
  }
  else if (left._type  == Arg::type_number ||
           right._type == Arg::type_number)
  {
    float left_number  = strtof (left._value.c_str (), NULL);
    float right_number = strtof (right._value.c_str (), NULL);
    result._value = (left_number <= right_number)
                  ? "true"
                  : "false";
  }
  else
  {
    result._value = (left._value <= right._value)
@ -415,6 +467,32 @@ void E9::operator_gte (Arg& result, Arg& left, Arg& right)
                    : "false";
    }
  }
  else if (left._type  == Arg::type_duration ||
           right._type == Arg::type_duration)
  {
    if (left._value == "" ||
        right._value == "")
      result._value = "false";
    else
    {
      Duration left_duration  (left._value);
      Duration right_duration (right._value);
      result._value = (left_duration >= right_duration)
                    ? "true"
                    : "false";
    }
  }
  else if (left._type  == Arg::type_number ||
           right._type == Arg::type_number)
  {
    float left_number  = strtof (left._value.c_str (), NULL);
    float right_number = strtof (right._value.c_str (), NULL);
    result._value = (left_number >= right_number)
                  ? "true"
                  : "false";
  }
  else
  {
    result._value = (left._value >= right._value)
@ -453,6 +531,32 @@ void E9::operator_gt (Arg& result, Arg& left, Arg& right)
                                    : "false";
    }
  }
  else if (left._type  == Arg::type_duration ||
           right._type == Arg::type_duration)
  {
    if (left._value == "" ||
        right._value == "")
      result._value = "false";
    else
    {
      Duration left_duration  (left._value);
      Duration right_duration (right._value);
      result._value = result._value = (left_duration > right_duration)
                                    ? "true"
                                    : "false";
    }
  }
  else if (left._type  == Arg::type_number ||
           right._type == Arg::type_number)
  {
    float left_number  = strtof (left._value.c_str (), NULL);
    float right_number = strtof (right._value.c_str (), NULL);
    result._value = (left_number > right_number)
                  ? "true"
                  : "false";
  }
  else
  {
    result._value = (left._value > right._value)
@ -497,7 +601,7 @@ void E9::operator_equal (
    // Bug 856.
    //
    // Special case for checking absent projects.  Without the explicit "" check
-    // the right._value.lenghth() is used, which is 0, and therefore generates
+    // the right._value.length() is used, which is 0, and therefore generates
    // a false match.
    if (right._value == "")
    {
@ -533,6 +637,16 @@ void E9::operator_equal (
                : "false";
  }
  // Case-insensitive comparison for status. Fixes #1110.
  // Also priority, fixing #1154.
  else if (left._raw == "status" ||
           left._raw == "priority")
  {
    result._value = compare (left._value, right._value, false)
                ? "true"
                : "false";
  }
  // Regular equality matching.
  else
  {
--- a/Show more
+++ b/Show more